diff --git a/docker/config/netcfg.json b/docker/config/netcfg.json
index 244caec..76b1dfa 100644
--- a/docker/config/netcfg.json
+++ b/docker/config/netcfg.json
@@ -33,7 +33,7 @@
   "devices": {
     "of:0001aabbccddeeff": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
@@ -42,7 +42,7 @@
     },
     "of:0001000000000002": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
@@ -51,7 +51,7 @@
     },
     "of:0001000000000003": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
@@ -60,7 +60,7 @@
     },
     "of:0001000000000004": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
@@ -69,7 +69,7 @@
     },
     "of:0001000000000005": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
@@ -78,7 +78,7 @@
     },
     "of:0001000000000006": {
       "basic": {
-        "driver": "pmc-olt"
+        "driver": "voltha"
       },
       "accessDevice": {
         "uplink": "0",
diff --git a/docs/manuals/user/labtests/M02_maple_olt_tests_onos.md b/docs/manuals/user/labtests/M02_maple_olt_tests_onos.md
index 55e7b2a..35c215b 100644
--- a/docs/manuals/user/labtests/M02_maple_olt_tests_onos.md
+++ b/docs/manuals/user/labtests/M02_maple_olt_tests_onos.md
@@ -75,7 +75,7 @@
 this will output the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=n/a, sw=logical device for Maple-based PON, serial=82126dceaa0b47f9ace655efcf7e97b4, driver=pmc-olt, channelId=172.25.0.1:57746, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=n/a, sw=logical device for Maple-based PON, serial=82126dceaa0b47f9ace655efcf7e97b4, driver=voltha, channelId=172.25.0.1:57746, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
 ```
 
 next let's have a look at the ports that onos sees. Remember that ONOS sees the PON system as a logical device so ONU are represented as ports to ONOS. So let's see the ports in ONOS.
@@ -87,7 +87,7 @@
 which returns the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=n/a, sw=logical device for Maple-based PON, serial=82126dceaa0b47f9ace655efcf7e97b4, driver=pmc-olt, channelId=172.25.0.1:57746, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=n/a, sw=logical device for Maple-based PON, serial=82126dceaa0b47f9ace655efcf7e97b4, driver=voltha, channelId=172.25.0.1:57746, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
   port=0, state=enabled, type=fiber, speed=0 , portName=nni, portMac=00:00:00:00:00:81
   port=1025, state=enabled, type=fiber, speed=0 , portName=uni-1025, portMac=00:00:00:00:04:01
 ```
diff --git a/docs/manuals/user/labtests/S02_ponsim_tests_onos.md b/docs/manuals/user/labtests/S02_ponsim_tests_onos.md
index cf336f7..a3596d5 100644
--- a/docs/manuals/user/labtests/S02_ponsim_tests_onos.md
+++ b/docs/manuals/user/labtests/S02_ponsim_tests_onos.md
@@ -75,7 +75,7 @@
 this will output the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=pmc-olt, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=voltha, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
 ```
 
 next let's have a look at the ports that onos sees. Remember that ONOS sees the PON system as a logical device so ONU are represented as ports to ONOS. So let's see the ports in ONOS.
@@ -87,7 +87,7 @@
 which returns the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=pmc-olt, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=voltha, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
   port=0, state=enabled, type=fiber, speed=0 , portName=nni, portMac=00:00:00:00:00:00
   port=128, state=enabled, type=fiber, speed=0 , portName=uni-128, portMac=00:00:00:00:00:80
   port=129, state=enabled, type=fiber, speed=0 , portName=uni-129, portMac=00:00:00:00:00:81
diff --git a/docs/manuals/user/labtests/T02_tibit_olt_tests_onos.md b/docs/manuals/user/labtests/T02_tibit_olt_tests_onos.md
index a362ad8..6770131 100644
--- a/docs/manuals/user/labtests/T02_tibit_olt_tests_onos.md
+++ b/docs/manuals/user/labtests/T02_tibit_olt_tests_onos.md
@@ -81,7 +81,7 @@
 this will output the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=pmc-olt, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=voltha, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
 ```
 
 next let's have a look at the ports that onos sees. Remember that ONOS sees the PON system as a logical device so ONU are represented as ports to ONOS. So let's see the ports in ONOS.
@@ -93,7 +93,7 @@
 which returns the following
 
 ```
-id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=pmc-olt, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
+id=of:0000000000000001, available=true, role=MASTER, type=SWITCH, mfr=cord porject, hw=simualted pon, sw=simualted pon, serial=46da01fd646d4bb08140fc09b1bc4926, driver=voltha, channelId=172.25.0.1:35866, managementAddress=172.25.0.1, name=of:0000000000000001, protocol=OF_13
   port=0, state=enabled, type=fiber, speed=0 , portName=nni, portMac=00:00:00:00:00:00
   port=128, state=enabled, type=fiber, speed=0 , portName=uni-128, portMac=00:00:00:00:00:80
   port=129, state=enabled, type=fiber, speed=0 , portName=uni-129, portMac=00:00:00:00:00:81