diff --git a/TestON/drivers/common/cli/check_status.py b/TestON/drivers/common/cli/check_status.py
index 8e870bc..791f1dd 100755
--- a/TestON/drivers/common/cli/check_status.py
+++ b/TestON/drivers/common/cli/check_status.py
@@ -3,8 +3,8 @@
 import os
 import sys
 
-# http://localhost:8080/wm/onos/ng/switches/json
-# http://localhost:8080/wm/onos/ng/links/json
+# http://localhost:8080/wm/onos/topology/switches
+# http://localhost:8080/wm/onos/topology/links
 # http://localhost:8080/wm/onos/registry/controllers/json
 # http://localhost:8080/wm/onos/registry/switches/json"
 
@@ -28,7 +28,7 @@
   retcode = 0
   RestPort="8080"
 
-  url="http://%s:%s/wm/onos/ng/switches/json" % (RestIP, RestPort)
+  url="http://%s:%s/wm/onos/topology/switches" % (RestIP, RestPort)
   parsedResult = get_json(url)
 
   if parsedResult == "":
@@ -72,7 +72,7 @@
   buf = ""
   retcode = 0
 
-  url = "http://%s:%s/wm/onos/ng/links/json" % (RestIP, RestPort)
+  url = "http://%s:%s/wm/onos/topology/links" % (RestIP, RestPort)
   parsedResult = get_json(url)
 
   if parsedResult == "":
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index fef306a..0b3e033 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -611,8 +611,8 @@
             main.exit()
 
 
-# http://localhost:8080/wm/onos/topology/switches/json
-# http://localhost:8080/wm/onos/topology/links/json
+# http://localhost:8080/wm/onos/topology/switches
+# http://localhost:8080/wm/onos/topology/links
 # http://localhost:8080/wm/onos/registry/controllers/json
 # http://localhost:8080/wm/onos/registry/switches/json"
 
@@ -1007,7 +1007,7 @@
         retport = [] # Switch port connected to to devices found with MAC
         foundHost = []
         try:
-            ##### device rest API is: 'host:8080/wm/onos/topology/switches/json' ###
+            ##### device rest API is: 'host:8080/wm/onos/topology/switches' ###
             url ="http://%s:%s%s" %(RestIP,RestPort,RestAPI)
 
             try:
diff --git a/TestON/tests/JamesTest/JamesTest.params b/TestON/tests/JamesTest/JamesTest.params
index 368e2e1..8cd0cbe 100644
--- a/TestON/tests/JamesTest/JamesTest.params
+++ b/TestON/tests/JamesTest/JamesTest.params
@@ -44,6 +44,6 @@
 	<restIP1>10.128.4.151</restIP1>
 	<restIP2>10.128.4.152</restIP2>
 	<restPort>8080</restPort>
-	<restURL>/wm/onos/topology/switches/json</restURL>
+	<restURL>/wm/onos/topology/switches</restURL>
     </RESTCALL>
 </PARAMS>      
diff --git a/TestON/tests/ONOSSanity4/ONOSSanity4.params b/TestON/tests/ONOSSanity4/ONOSSanity4.params
index c3ffb50..027d361 100644
--- a/TestON/tests/ONOSSanity4/ONOSSanity4.params
+++ b/TestON/tests/ONOSSanity4/ONOSSanity4.params
@@ -44,6 +44,6 @@
 	<restIP1>10.128.4.151</restIP1>
 	<restIP2>10.128.4.152</restIP2>
 	<restPort>8080</restPort>
-	<restURL>/wm/onos/topology/switches/json</restURL>
+	<restURL>/wm/onos/topology/switches</restURL>
     </RESTCALL>
 </PARAMS>      
diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
index bda33b2..8c482b0 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.params
@@ -29,22 +29,22 @@
 	<sw1>s1</sw1>
     </PLUG>
     <CTRL>
-        <ip1>10.128.4.151</ip1>
+        <ip1>10.128.100.21</ip1>
         <port1>6633</port1>
-        <ip2>10.128.4.152</ip2>
+        <ip2>10.128.100.22</ip2>
         <port2>6633</port2>
-        <ip3>10.128.4.153</ip3>
+        <ip3>10.128.100.23</ip3>
         <port3>6633</port3>
-        <ip4>10.128.4.154</ip4>
+        <ip4>10.128.100.24</ip4>
         <port4>6633</port4>
     </CTRL>
-    <RestIP>10.128.4.151</RestIP>
+    <RestIP>10.128.100.21</RestIP>
     <NR_Switches>25</NR_Switches>
     <NR_Links>50</NR_Links>
     <RESTCALL>
-	<restIP1>10.128.4.151</restIP1>
-	<restIP2>10.128.4.152</restIP2>
+	<restIP1>10.128.100.21</restIP1>
+	<restIP2>10.128.100.22</restIP2>
 	<restPort>8080</restPort>
-	<restURL>/wm/onos/topology/switches/json</restURL>
+	<restURL>/wm/onos/topology/devices</restURL>
     </RESTCALL>
 </PARAMS>      
diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
index 3ccf2e9..357aa21 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
@@ -2,7 +2,7 @@
 
     <COMPONENT>
         <Zookeeper1>
-            <host>10.128.4.151</host>
+            <host>10.128.100.21</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -12,7 +12,7 @@
         </Zookeeper1>
 
         <Zookeeper2>
-            <host>10.128.4.152</host>
+            <host>10.128.100.22</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -22,7 +22,7 @@
         </Zookeeper2>
 
         <Zookeeper3>
-            <host>10.128.4.153</host>
+            <host>10.128.100.23</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -32,7 +32,7 @@
         </Zookeeper3>
        
         <Zookeeper4>
-            <host>10.128.4.154</host>
+            <host>10.128.100.24</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -42,7 +42,7 @@
         </Zookeeper4>
 
         <RamCloud1>
-            <host>10.128.4.151</host>
+            <host>10.128.100.21</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -52,7 +52,7 @@
         </RamCloud1>
 
         <RamCloud2>
-            <host>10.128.4.152</host>
+            <host>10.128.100.22</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -62,7 +62,7 @@
         </RamCloud2>
        
         <RamCloud3>
-            <host>10.128.4.153</host>
+            <host>10.128.100.23</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -72,7 +72,7 @@
         </RamCloud3>
        
         <RamCloud4>
-            <host>10.128.4.154</host>
+            <host>10.128.100.24</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -82,7 +82,7 @@
         </RamCloud4>
 
         <ONOS1>
-            <host>10.128.4.151</host>
+            <host>10.128.100.21</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -92,7 +92,7 @@
         </ONOS1>
 
         <ONOS2>
-            <host>10.128.4.152</host>
+            <host>10.128.100.22</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -102,7 +102,7 @@
         </ONOS2>
 
         <ONOS3>
-            <host>10.128.4.153</host>
+            <host>10.128.100.23</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -112,7 +112,7 @@
         </ONOS3>
        
         <ONOS4>
-            <host>10.128.4.154</host>
+            <host>10.128.100.24</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -122,14 +122,14 @@
         </ONOS4>
 
         <Mininet1>
-            <host>10.128.4.159</host>
+            <host>10.128.100.25</host>
             <user>admin</user>
             <password></password>
             <type>MininetCliDriver</type>
             <connect_order>13</connect_order>
             <COMPONENTS>
                 # Specify the Option for mininet
-                <arg1> --custom ~/mininet/custom/topo-onos4nodeNEW.py </arg1>
+                <arg1> --custom ~/mininet/custom/topo-onos4node.py </arg1>
                 <arg2> --topo mytopo --arp</arg2>
                 <controller> remote </controller>
              </COMPONENTS>
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
index c67397f..cee149e 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
@@ -28,22 +28,22 @@
 	<sw1>s1</sw1>
     </PLUG>
     <CTRL>
-        <ip1>10.128.4.151</ip1>
+        <ip1>10.128.100.21</ip1>
         <port1>6633</port1>
-        <ip2>10.128.4.152</ip2>
+        <ip2>10.128.100.22</ip2>
         <port2>6633</port2>
-        <ip3>10.128.4.153</ip3>
+        <ip3>10.128.100.23</ip3>
         <port3>6633</port3>
-        <ip4>10.128.4.154</ip4>
+        <ip4>10.128.100.24</ip4>
         <port4>6633</port4>
     </CTRL>
-    <RestIP>10.128.4.151</RestIP>
+    <RestIP>10.128.100.21</RestIP>
     <NR_Switches>25</NR_Switches>
     <NR_Links>50</NR_Links>
     <RESTCALL>
-	<restIP1>10.128.4.151</restIP1>
-	<restIP2>10.128.4.152</restIP2>
+	<restIP1>10.128.100.21</restIP1>
+	<restIP2>10.128.100.22</restIP2>
 	<restPort>8080</restPort>
-	<restURL>/wm/onos/topology/devices/json</restURL>
+	<restURL>/wm/onos/topology/devices</restURL>
     </RESTCALL>
 </PARAMS>