diff --git a/src/main/java/io/bitsquare/app/ArgumentParser.java b/src/main/java/io/bitsquare/app/ArgumentParser.java
index e62351e766..c2a59f7943 100644
--- a/src/main/java/io/bitsquare/app/ArgumentParser.java
+++ b/src/main/java/io/bitsquare/app/ArgumentParser.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.app;
 
-import io.bitsquare.network.BootstrapNode;
+import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
@@ -30,7 +30,7 @@ public class ArgumentParser {
     public static final String PORT_FLAG = "port";
     public static final String INTERFACE_HINT_FLAG = "interface";
     public static final String NAME_FLAG = "name";
-    public static final String PEER_ID_DEFAULT = BootstrapNode.DIGITAL_OCEAN1.getId();
+    public static final String PEER_ID_DEFAULT = BootstrapNodes.DIGITAL_OCEAN_1.getId();
 
     private final net.sourceforge.argparse4j.inf.ArgumentParser parser;
 
diff --git a/src/main/java/io/bitsquare/app/cli/SeedNode.java b/src/main/java/io/bitsquare/app/cli/SeedNode.java
index 1b3d847b3a..735b986ca6 100644
--- a/src/main/java/io/bitsquare/app/cli/SeedNode.java
+++ b/src/main/java/io/bitsquare/app/cli/SeedNode.java
@@ -21,7 +21,7 @@ import io.bitsquare.app.ArgumentParser;
 import io.bitsquare.msg.actor.DHTManager;
 import io.bitsquare.msg.actor.command.InitializePeer;
 import io.bitsquare.msg.actor.event.PeerInitialized;
-import io.bitsquare.network.BootstrapNode;
+import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 
 import java.net.UnknownHostException;
@@ -56,13 +56,13 @@ public class SeedNode {
             interfaceHint = namespace.getString(ArgumentParser.INTERFACE_HINT_FLAG);
 
         int serverPort = Integer.valueOf(namespace.getString(ArgumentParser.PORT_FLAG));
-        String seedID = BootstrapNode.LOCALHOST.getId();
+        String seedID = BootstrapNodes.LOCALHOST.getId();
         if (namespace.getString(ArgumentParser.PEER_ID_FLAG) != null) {
             seedID = namespace.getString(ArgumentParser.PEER_ID_FLAG);
         }
 
         final Set<PeerAddress> peerAddresses = new HashSet<>();
-        for (Node node : BootstrapNode.all()) {
+        for (Node node : BootstrapNodes.all()) {
             if (!node.getId().equals(seedID)) {
                 try {
                     peerAddresses.add(new PeerAddress(Number160.createHash(node.getId()), node.getIp(),
diff --git a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
index 963c9df001..4e1e75c2fe 100644
--- a/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
+++ b/src/main/java/io/bitsquare/msg/DefaultMessageModule.java
@@ -18,7 +18,7 @@
 package io.bitsquare.msg;
 
 import io.bitsquare.AbstractBitsquareModule;
-import io.bitsquare.network.BootstrapNode;
+import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 
 import com.google.inject.Injector;
@@ -44,7 +44,7 @@ public class DefaultMessageModule extends AbstractBitsquareModule implements Mes
 
         bind(Node.class)
                 .annotatedWith(Names.named("bootstrapNode"))
-                .toInstance(BootstrapNode.LOCALHOST);
+                .toInstance(BootstrapNodes.LOCALHOST);
     }
 
     @Override
diff --git a/src/main/java/io/bitsquare/network/BootstrapNode.java b/src/main/java/io/bitsquare/network/BootstrapNodes.java
similarity index 85%
rename from src/main/java/io/bitsquare/network/BootstrapNode.java
rename to src/main/java/io/bitsquare/network/BootstrapNodes.java
index e59d57ba49..5d8c4b5a75 100644
--- a/src/main/java/io/bitsquare/network/BootstrapNode.java
+++ b/src/main/java/io/bitsquare/network/BootstrapNodes.java
@@ -20,13 +20,13 @@ package io.bitsquare.network;
 import java.util.Arrays;
 import java.util.List;
 
-public interface BootstrapNode {
+public interface BootstrapNodes {
     Node LOCALHOST = Node.at("localhost", "127.0.0.1");
-    Node DIGITAL_OCEAN1 = Node.at("digitalocean1.bitsquare.io", "188.226.179.109");
+    Node DIGITAL_OCEAN_1 = Node.at("digitalocean1.bitsquare.io", "188.226.179.109");
 
     static List<Node> all() {
         return Arrays.asList(
-                LOCALHOST, DIGITAL_OCEAN1
+                LOCALHOST, DIGITAL_OCEAN_1
         );
     }
 }
diff --git a/src/test/java/io/bitsquare/msg/TomP2PTests.java b/src/test/java/io/bitsquare/msg/TomP2PTests.java
index f5116a6b24..a2ea4e6092 100644
--- a/src/test/java/io/bitsquare/msg/TomP2PTests.java
+++ b/src/test/java/io/bitsquare/msg/TomP2PTests.java
@@ -17,7 +17,7 @@
 
 package io.bitsquare.msg;
 
-import io.bitsquare.network.BootstrapNode;
+import io.bitsquare.network.BootstrapNodes;
 import io.bitsquare.network.Node;
 import io.bitsquare.util.Repeat;
 
@@ -83,7 +83,7 @@ public class TomP2PTests {
     // Typically you run the seed node in localhost to test direct connection.
     // If you have a setup where you are not behind a router you can also use a WAN side seed node.
     private static final Node BOOTSTRAP_NODE =
-            (FORCED_CONNECTION_TYPE == ConnectionType.DIRECT) ? BootstrapNode.LOCALHOST : BootstrapNode.DIGITAL_OCEAN1;
+            (FORCED_CONNECTION_TYPE == ConnectionType.DIRECT) ? BootstrapNodes.LOCALHOST : BootstrapNodes.DIGITAL_OCEAN_1;
 
     private static final PeerAddress BOOTSTRAP_NODE_ADDRESS;