diff --git a/mwc-provision-dev.sh b/mwc-provision-dev.sh
index 62d8782..a2cc240 100755
--- a/mwc-provision-dev.sh
+++ b/mwc-provision-dev.sh
@@ -4,6 +4,10 @@
 
 set -ex
 
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mwc-demo.json
+sleep 2
+onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
+sleep 2
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf1-netcfg.json
 sleep 5
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/tofino-leaf2-netcfg.json
@@ -12,8 +16,4 @@
 sleep 5
 onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/cavium-spine1.json
 sleep 5
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/mwc-demo.json
-sleep 10
-onos-netcfg ${MWC_HEAD_IP} ${ONOS_ROOT}/p4-pod-configs/dev-pod/hosts.json
-sleep 5
 bash fpcagent/scripts/addP4DPN.sh ${MWC_HEAD_IP} device:tofino:leaf2
diff --git a/p4-pod-configs/dev-pod/hosts.json b/p4-pod-configs/dev-pod/hosts.json
index 41fb944..42c5877 100644
--- a/p4-pod-configs/dev-pod/hosts.json
+++ b/p4-pod-configs/dev-pod/hosts.json
@@ -2,44 +2,51 @@
   "hosts": {
     "00:1E:67:D2:EC:7F/None": {
       "basic": {
+        "name": "Compute node 1",
         "ips": ["10.6.1.3"],
         "locations": ["device:tofino:leaf1/180"]
       }
     },
     "00:AD:DE:00:00:80/None": {
       "basic": {
+        "name": "eNodeB",
         "ips": ["119.0.0.10", "118.0.0.10"],
         "locations": ["device:tofino:leaf1/181"]
       }
     },
     "00:1E:67:D2:EE:EE/None": {
       "basic": {
+        "name": "Compute node 2",
         "ips": ["10.6.2.2"],
         "locations": ["device:tofino:leaf2/180"]
       }
     },
-    "00:9D:0F:57:D5:BD/None": {
+    "72:9D:0F:57:D5:BD/None": {
       "basic": {
+        "name": "ARM server",
         "ips": ["150.0.0.10"],
         "locations": ["device:tofino:leaf2/182"]
       }
     },
-    "fa:16:3e:65:60:e1/None": {
+    "fa:16:3e:95:0f:87/None": {
       "basic": {
+        "name": "spgw-u 1",
         "ips": ["119.0.0.2"],
         "locations": ["device:tofino:leaf1/180"]
       }
     },
-    "fa:16:3e:bc:0c:27/None": {
+    "fa:16:3e:64:cc:23/None": {
       "basic": {
+        "name": "MME1",
         "ips": ["118.0.0.2"],
         "locations": ["device:tofino:leaf1/180"]
       }
     },
-    "FA:16:3E:45:13:C2/None": {
+    "fa:16:3e:26:68:30/None": {
       "basic": {
-        "ips": ["118.0.0.5"],
-        "locations": ["device:tofino:leaf1/180"]
+        "name": "MME2",
+        "ips": ["122.0.0.2"],
+        "locations": ["device:tofino:leaf2/180"]
       }
     }
   }
diff --git a/p4-pod-configs/dev-pod/mwc-demo.json b/p4-pod-configs/dev-pod/mwc-demo.json
index f84b1e3..0d9a844 100644
--- a/p4-pod-configs/dev-pod/mwc-demo.json
+++ b/p4-pod-configs/dev-pod/mwc-demo.json
@@ -78,7 +78,7 @@
     "device:tofino:leaf1/182": {
       "interfaces": [
         {
-          "name": "leaf1-3/2----head-node",
+          "name": "leaf1-3/2--head-node(ProgRAN)",
           "ips": [
             "118.0.0.254/24"
           ],
@@ -91,23 +91,13 @@
         {
           "name": "leaf2-3/0-compute-2",
           "ips": [
-            "10.6.2.254/24"
+            "10.6.2.254/24",
+            "122.0.0.254/24"
           ],
           "vlan-untagged": 20
         }
       ]
     },
-    "device:tofino:leaf2/181": {
-      "interfaces": [
-        {
-          "name": "leaf2-3/1-------mgmt-26---enb",
-          "ips": [
-            "140.0.0.2/24"
-          ],
-          "vlan-untagged": 140
-        }
-      ]
-    },
     "device:tofino:leaf2/182": {
       "interfaces": [
         {