diff --git a/src/main/java/io/bitsquare/BitSquare.java b/src/main/java/io/bitsquare/BitSquare.java
index 2a436b1258..f3e6c76d22 100644
--- a/src/main/java/io/bitsquare/BitSquare.java
+++ b/src/main/java/io/bitsquare/BitSquare.java
@@ -85,7 +85,7 @@ public class BitSquare {
                 interfaceHint = namespace.getString(BitsquareArgumentParser.INFHINT_FLAG);
             }
 
-            if (namespace.getBoolean(BitsquareArgumentParser.BOOTSTRAP_FLAG) == true) {
+            if (namespace.getBoolean(BitsquareArgumentParser.SEED_FLAG) == true) {
                 String seedID = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1.getId();
                 if (namespace.getString(BitsquareArgumentParser.PEER_ID_FLAG) != null) {
                     seedID = namespace.getString(BitsquareArgumentParser.PEER_ID_FLAG);
diff --git a/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java b/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java
index b089d04222..356a5bd8b5 100644
--- a/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java
+++ b/src/main/java/io/bitsquare/util/BitsquareArgumentParser.java
@@ -27,7 +27,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 
 public class BitsquareArgumentParser {
 
-    public static String BOOTSTRAP_FLAG = "bootstrap";
+    public static String SEED_FLAG = "seed";
     public static String PEER_ID_FLAG = "peerid";
     public static String PORT_FLAG = "port";
     public static Integer PORT_DEFAULT = 5000;
@@ -40,17 +40,17 @@ public class BitsquareArgumentParser {
         parser = ArgumentParsers.newArgumentParser("BitSquare")
                 .defaultHelp(true)
                 .description("BitSquare decentralized bitcoin exchange.");
-        parser.addArgument("-b", "--" + BOOTSTRAP_FLAG)
+        parser.addArgument("-s", "--" + SEED_FLAG)
                 .action(Arguments.storeTrue())
-                .help("Start as DHT bootstrap peer, no UI.");
+                .help("Start as DHT seed peer, no UI.");
         parser.addArgument("-d", "--" + PEER_ID_FLAG)
                 .setDefault(SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1.getId())
-                .help("Bootstrap peer ID.");
+                .help("Seed peer ID.");
         parser.addArgument("-p", "--"+PORT_FLAG)
                 .setDefault(PORT_DEFAULT)
                 .help("IP port to listen on.");
         parser.addArgument("-i", "--" + INFHINT_FLAG)
-                .help("interface to listen on.");
+                .help("Network interface to listen on.");
         parser.addArgument("-n", "--"+NAME_FLAG)
                 .help("Append name to application name.");
     }
diff --git a/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java b/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java
index 0cd73cd891..99cc1b50c2 100644
--- a/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java
+++ b/src/test/java/io/bitsquare/msg/BasicUsecasesInWANTest.java
@@ -61,9 +61,10 @@ public class BasicUsecasesInWANTest {
     // update to external ip (whats my ip)
     private final static String CLIENT_IP = "83.36.8.117";
 
-    private final static String SERVER_ID = "digitalocean1.bitsquare.io";
-    private final static String SERVER_IP = "188.226.179.109";
-    //private final static String SERVER_IP = "128.199.251.106"; // steves server
+    //private final static String SERVER_ID = "digitalocean1.bitsquare.io";
+    private final static String SERVER_ID = "digitalocean2.bitsquare.io";  // steve's server
+    //private final static String SERVER_IP = "188.226.179.109";
+    private final static String SERVER_IP = "128.199.251.106"; // steve's server
     private final static int SERVER_PORT = 5000;
 
     private final static String CLIENT_1_ID = "alice";