diff --git a/assets/src/main/java/haveno/asset/EtherAddressValidator.java b/assets/src/main/java/haveno/asset/EVMAddressValidator.java
similarity index 85%
rename from assets/src/main/java/haveno/asset/EtherAddressValidator.java
rename to assets/src/main/java/haveno/asset/EVMAddressValidator.java
index 5c7a0b18f8..ca7d04b06d 100644
--- a/assets/src/main/java/haveno/asset/EtherAddressValidator.java
+++ b/assets/src/main/java/haveno/asset/EVMAddressValidator.java
@@ -27,14 +27,16 @@ package haveno.asset;
  *
  * @author Chris Beams
  * @since 0.7.0
+ *
+ * Edit: renamed EVMAddressValidator for being used by all EVMs
  */
-public class EtherAddressValidator extends RegexAddressValidator {
+public class EVMAddressValidator extends RegexAddressValidator {
 
-    public EtherAddressValidator() {
+    public EVMAddressValidator() {
         super("^(0x)?[0-9a-fA-F]{40}$");
     }
 
-    public EtherAddressValidator(String errorMessageI18nKey) {
+    public EVMAddressValidator(String errorMessageI18nKey) {
         super("^(0x)?[0-9a-fA-F]{40}$", errorMessageI18nKey);
     }
 }
diff --git a/assets/src/main/java/haveno/asset/Erc20Token.java b/assets/src/main/java/haveno/asset/Erc20Token.java
index 621f5acae4..710c91af8a 100644
--- a/assets/src/main/java/haveno/asset/Erc20Token.java
+++ b/assets/src/main/java/haveno/asset/Erc20Token.java
@@ -28,6 +28,6 @@ package haveno.asset;
 public abstract class Erc20Token extends Token {
 
     public Erc20Token(String name, String tickerSymbol) {
-        super(name, tickerSymbol, new EtherAddressValidator());
+        super(name, tickerSymbol, new EVMAddressValidator());
     }
 }
diff --git a/assets/src/main/java/haveno/asset/coins/Ether.java b/assets/src/main/java/haveno/asset/coins/Ether.java
index 35d5b1986c..0418cfe27b 100644
--- a/assets/src/main/java/haveno/asset/coins/Ether.java
+++ b/assets/src/main/java/haveno/asset/coins/Ether.java
@@ -18,11 +18,11 @@
 package haveno.asset.coins;
 
 import haveno.asset.Coin;
-import haveno.asset.EtherAddressValidator;
+import haveno.asset.EVMAddressValidator;
 
 public class Ether extends Coin {
 
     public Ether() {
-        super("Ether", "ETH", new EtherAddressValidator());
+        super("Ether", "ETH", new EVMAddressValidator());
     }
 }