Merge remote-tracking branch 'upstream/master'
diff --git a/web/config.json.sw b/web/config.json.sw
index 282e17a..7c6e702 100644
--- a/web/config.json.sw
+++ b/web/config.json.sw
@@ -2,18 +2,18 @@
     "LB": false, 
     "TESTBED": "sw",
     "ONOS_DEFAULT_HOST": "localhost",
-    "ONOS_GUI3_CONTROL_HOST": "http://devy-gui.onlab.us:8080", 
-    "ONOS_GUI3_HOST": "http://devy-gui.onlab.us:8080", 
-    "cluster_basename": "onosdevy", 
+    "ONOS_GUI3_CONTROL_HOST": "http://gui3.onlab.us:8081", 
+    "ONOS_GUI3_HOST": "http://gui3.onlab.us:8080", 
+    "cluster_basename": "onosgui", 
     "controllers": [
-        "onosdevy1", 
-        "onosdevy2", 
-        "onosdevy3", 
-        "onosdevy4", 
-        "onosdevy5", 
-        "onosdevy6", 
-        "onosdevy7", 
-        "onosdevy8"
+        "onosgui1", 
+        "onosgui2", 
+        "onosgui3", 
+        "onosgui4", 
+        "onosgui5", 
+        "onosgui6", 
+        "onosgui7", 
+        "onosgui8"
     ], 
     "core_switches": [
         "00:00:00:00:ba:5e:ba:11",