diff --git a/basice2e/gateway-1.yaml b/basice2e/gateway-1.yaml
index 20dcd0dd6d3863ceb76c7bc254c7b7fe39a05dfe..8053e2b389abcc65b393dc3c4fa5148ff8f97db1 100644
--- a/basice2e/gateway-1.yaml
+++ b/basice2e/gateway-1.yaml
@@ -14,8 +14,8 @@ logLevel: 1
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50000"
 
-# The listening address of this gateway
-#localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 8440
 
 # The number of seconds a message should remain in the globals before being
diff --git a/basice2e/gateway-2.yaml b/basice2e/gateway-2.yaml
index 41f7746dda98ab69256653224a397ee30450c6cb..3db5824d0a7e7f896b7f200a83abdd2d9e7d5f25 100644
--- a/basice2e/gateway-2.yaml
+++ b/basice2e/gateway-2.yaml
@@ -14,8 +14,8 @@ logLevel: 1
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50001"
 
-# The listening address of this gateway
-#localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 8441
 
 # The number of seconds a message should remain in the globals before being
diff --git a/basice2e/gateway-3.yaml b/basice2e/gateway-3.yaml
index 7190cf5ec70a6ebde90ddd496be6d32346b22222..219c5fb1690bca0a03bb1fb1a8659d87ade45cf9 100644
--- a/basice2e/gateway-3.yaml
+++ b/basice2e/gateway-3.yaml
@@ -14,8 +14,8 @@ logLevel: 1
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50002"
 
-# The listening address of this gateway
-#localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 8442
 
 # The number of seconds a message should remain in the globals before being
diff --git a/basice2e/gateway-4.yaml b/basice2e/gateway-4.yaml
index bfd429c95d66d8a1931fa782f1fbd7e792542ef4..033542931c8aa95c9d7a26d92d585170c0386b56 100644
--- a/basice2e/gateway-4.yaml
+++ b/basice2e/gateway-4.yaml
@@ -14,8 +14,8 @@ logLevel: 1
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50003"
 
-# The listening address of this gateway
-#localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 8443
 
 # The number of seconds a message should remain in the globals before being
diff --git a/basice2e/gateway-5.yaml b/basice2e/gateway-5.yaml
index 05eff5b7517d8dd5c3e87db03c4c605062318487..85aa82ca632d2e920fe3390fec2a1dfc6ebaa49c 100644
--- a/basice2e/gateway-5.yaml
+++ b/basice2e/gateway-5.yaml
@@ -14,8 +14,8 @@ logLevel: 1
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:50004"
 
-# The listening address of this gateway
-#localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 8444
 
 # The number of seconds a message should remain in the globals before being
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index fe850d69102f51e8cad32f8cd10889c81ef3f952..73f786670e8fb39375a3f82a31906355509befd2 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-1.err"
         ipListOutput: "results/servers/iplist-1.txt"
     port: 50000
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 9d837df9052fb88ee0ff7c0df21e34ca2e4e82f9..b8331377c6089be2f25c8859562431de1c99b4fc 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-2.err"
         ipListOutput: "results/servers/iplist-2.txt"
     port: 50001
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 5debc9f14ee5fa666098740552044754d7c290cb..156e07e22fc561e95930dcf196f568c879717935 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-3.err"
         ipListOutput: "results/servers/iplist-3.txt"
     port: 50002
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index a5233430f7b65256d86992c63a2b53053e3049d6..74e5407bc329ca319ecf1f93a4acefc7bf1ef34c 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-4.err"
         ipListOutput: "results/servers/iplist-4.txt"
     port: 50003
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node4"
     username: "cmix_server"
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 6d76a6a3a22d8ffcab47348440138d00d21b8353..193a352ac21d27941008999551cc9ab498594e8e 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -17,7 +17,7 @@ node:
         errOutput: "results/servers/server-5.err"
         ipListOutput: "results/servers/iplist-5.txt"
     port: 50004
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node5"
     username: "cmix_server"
diff --git a/smokeinfra/gateway-1.yaml b/smokeinfra/gateway-1.yaml
index 73ef52102a3d0b2ae9adcbe7005a06cd2e53d2d5..f25b297004df580422a73cd4aff527b0b28aef22 100644
--- a/smokeinfra/gateway-1.yaml
+++ b/smokeinfra/gateway-1.yaml
@@ -14,8 +14,8 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60000"
 
-# The listening address of this gateway
-localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 9440
 
 # The number of seconds a message should remain in the globals before being
diff --git a/smokeinfra/gateway-2.yaml b/smokeinfra/gateway-2.yaml
index 38b094097ab4879a36a77896878d4db0dc4df025..ef4e415976a193194f345cd1b28dcdc21a9497e4 100644
--- a/smokeinfra/gateway-2.yaml
+++ b/smokeinfra/gateway-2.yaml
@@ -14,8 +14,8 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60001"
 
-# The listening address of this gateway
-localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 9441
 
 # The number of seconds a message should remain in the globals before being
diff --git a/smokeinfra/gateway-3.yaml b/smokeinfra/gateway-3.yaml
index 09caf634a18fb351aaf9fe8800678bd56f98d7a5..b2ca94481be755d154113b86fb2e1016675ca748 100644
--- a/smokeinfra/gateway-3.yaml
+++ b/smokeinfra/gateway-3.yaml
@@ -14,8 +14,8 @@ logLevel: 2
 # The public IP address and port of the node associated with this gateway
 nodeAddress: "127.0.0.1:60002"
 
-# The listening address of this gateway
-localAddress: "127.0.0.1"
+# Port for Gateway to listen on. Gateway must be the only listener on this port.
+# Required field.
 port: 9442
 
 # The number of seconds a message should remain in the globals before being
diff --git a/smokeinfra/server-1.yaml b/smokeinfra/server-1.yaml
index 899227d6946683e8b75e2bcd417530805000cc93..dbf1d1afab9a9dc0fd6abca97d8dd0e73969a3d6 100644
--- a/smokeinfra/server-1.yaml
+++ b/smokeinfra/server-1.yaml
@@ -17,7 +17,7 @@ node:
         log:  "results/server-1.log"
         errOutput: "results/server-1.err"
     port: 60000
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node1"
     username: "cmix_server"
diff --git a/smokeinfra/server-2.yaml b/smokeinfra/server-2.yaml
index 4be4b17aa80c99fbf39c93a23092965f0f8b584a..82ed96fc376a31f11e7db78b9b69e794d31ce404 100644
--- a/smokeinfra/server-2.yaml
+++ b/smokeinfra/server-2.yaml
@@ -17,7 +17,7 @@ node:
         ipListOutput:  "results/ipList-2.txt"
         errOutput: "results/server-2.err"
     port: 60001
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node2"
     username: "cmix_server"
diff --git a/smokeinfra/server-3.yaml b/smokeinfra/server-3.yaml
index e5fcb619091b70d7a09aa93b602812ef950d9124..7e564ddd8282720d29858dd4984c938e864bb486 100644
--- a/smokeinfra/server-3.yaml
+++ b/smokeinfra/server-3.yaml
@@ -17,7 +17,7 @@ node:
         ipListOutput:  "results/ipList-3.txt"
         errOutput: "results/server-3.err"
     port: 60002
-    listeningAddress: "127.0.0.1"
+    addressOverride: "127.0.0.1"
 database:
     name: "node3"
     username: "cmix_server"