diff --git a/Dockerfiles/forContainerNet/bootserver/bootstrap_server.py b/Dockerfiles/forContainerNet/bootserver/bootstrap_server.py
index 9585a0d..6aaefd1 100755
--- a/Dockerfiles/forContainerNet/bootserver/bootstrap_server.py
+++ b/Dockerfiles/forContainerNet/bootserver/bootstrap_server.py
@@ -27,12 +27,13 @@ DEV1_GWF3_IP = '10.0.3.1' #name = dev1gwf3
 DEV2_GWF3_IP = '10.0.3.2' #name = dev2gwf3
 DEV3_GWF3_IP = '10.0.3.3' #name = dev3gwf3
 
-#Formats of configs:
-SERVER =    "--local_ip ​ 127.0.0.1​ --local_port ​ 8080 --local_name ​ %s"
-GATEWAY_I = "--local_ip ​ 127.0.0.1​ --local_port ​ 8181 --local_name ​ %s​ --remote_ip ​ %s --remote_port 8080​ --remote_name ​ %s"
-GATEWAY_F = "--local_ip ​ 127.0.0.1​ --local_port ​ 8282 --local_name ​ %s --remote_ip ​ %s​ --remote_port 8181​ --remote_name ​ %s"
-DEV =       "--local_ip ​ 127.0.0.1​ --local_port ​ 9001 --local_name ​ %s --remote_ip ​ %s --remote_port 8282​ --remote_name ​ %s --send_period ​ 3000"
-
+'''
+Formats of configs:
+SERVER =    "--local_ip 127.0.0.1 --local_port 8080 --local_name %s"
+GATEWAY_I = "--local_ip 127.0.0.1 --local_port 8181 --local_name %s --remote_ip %s --remote_port 8080 --remote_name %s"
+GATEWAY_F = "--local_ip 127.0.0.1​ --local_port 8282 --local_name %s --remote_ip %s --remote_port 8181 --remote_name %s"
+DEV =       "--local_ip 127.0.0.1​ --local_port 9001 --local_name %s --remote_ip %s --remote_port 8282 --remote_name %s --send_period 3000"
+'''
 
 @app.route("/getmyconfig/<string:my_ip>")
 def configurations_giver(my_ip):
diff --git a/Dockerfiles/forContainerNet/gwi2/Dockerfile b/Dockerfiles/forContainerNet/goteway/Dockerfile
similarity index 100%
rename from Dockerfiles/forContainerNet/gwi2/Dockerfile
rename to Dockerfiles/forContainerNet/goteway/Dockerfile
diff --git a/Dockerfiles/forContainerNet/gwi2/bootstrap_client.py b/Dockerfiles/forContainerNet/goteway/bootstrap_client.py
similarity index 100%
rename from Dockerfiles/forContainerNet/gwi2/bootstrap_client.py
rename to Dockerfiles/forContainerNet/goteway/bootstrap_client.py
diff --git a/topologie/topology_test.py b/topologie/topology_test.py
index 348b772..69fc649 100755
--- a/topologie/topology_test.py
+++ b/topologie/topology_test.py
@@ -114,7 +114,7 @@ def create_topology():
     btrap = net.addDocker('btrap', ip=BOOTSTRAP_SERVER, dimage="config:topo")
 
     info('*** Adding topology server\n')
-    srv = net.addDocker('srv', ip=SVR_IP, dimage="server:topo", environment={'MY_IP':SVR_IP})# ports=[8080], publish_all_ports=True,
+    srv = net.addDocker('srv', ip=SVR_IP, dimage="server:topo", environment={'MY_IP':SVR_IP})
 
     info('*** Adding topology intermediary gateway\n')
     #gwi1 = net.addDocker('gwi1', ip=GWI1_IP, dimage="gateway:topo", environment={'MY_IP':GWI1_IP})