diff --git a/docs/manuals/user/labtests/M01_maple_olt_tests_activate_olt.md b/docs/manuals/user/labtests/M01_maple_olt_tests_activate_olt.md
index 9dffc62..78ac807 100644
--- a/docs/manuals/user/labtests/M01_maple_olt_tests_activate_olt.md
+++ b/docs/manuals/user/labtests/M01_maple_olt_tests_activate_olt.md
@@ -14,9 +14,9 @@
 
 #### Temporary Configuration
 
-* The following commands are temporary and will be removed when full 
+* The following commands are temporary and will be removed when full
   support in added to VOLTHA. The following commands add and verify
-  the VLAN 4092 interface to VOLTHA along with an IP address in the 
+  the VLAN 4092 interface to VOLTHA along with an IP address in the
   subnet used to communicate with the Maple OLT.
 
 ```
@@ -29,7 +29,7 @@
 exit
 
 ```
-  
+
 
 * Start the VOLTHA CLI
 
@@ -82,7 +82,7 @@
 * To activate the OLT, execute the following command
 
 ```
-activate_olt
+enable
 ```
 * VOLTHA should initiate a connection and activation request to the Maple OLT
 * VOLHA will create the logical OpenFlow device and ports and notify ONOS
@@ -110,7 +110,7 @@
 ```
 
 * Activating the ONU currently initiates an OMCI exchange between
-  the OLT and ONU. In addition, EAPOL, IGMP and DHCP forwarding rules 
+  the OLT and ONU. In addition, EAPOL, IGMP and DHCP forwarding rules
   are installed.
 * Note: the automatic initiation of OMCI messaging and installation of
   forwarding rules is temporary and will be driven by flow rules in
@@ -150,6 +150,3 @@
 * OLT / ONUs status can be seen from Device Console
 * Confirm OLT and ONUs have "oper_status" of ACTIVE
 * ONUs should not authenticate
-
-
-
diff --git a/docs/manuals/user/labtests/S01_ponsim_tests_launch_and_activate.md b/docs/manuals/user/labtests/S01_ponsim_tests_launch_and_activate.md
index 20dd2b7..3c0f449 100644
--- a/docs/manuals/user/labtests/S01_ponsim_tests_launch_and_activate.md
+++ b/docs/manuals/user/labtests/S01_ponsim_tests_launch_and_activate.md
@@ -91,7 +91,7 @@
 Next, we need to activate the OLT in voltha.
 
 ```
-activate_olt
+enable
 ```
 
 which returns
@@ -118,7 +118,7 @@
 +--------------+------------+------+--------------+------+-------------+-------------+----------------+----------------+------------------+-------------------------+--------------------------+
 ```
 
-Also we can observe similar output at the REST API. To use the REST, open a new shell to the server and run the following command.  Note: The port number needs to be the recorded port number from the VOLTHA installation. 
+Also we can observe similar output at the REST API. To use the REST, open a new shell to the server and run the following command.  Note: The port number needs to be the recorded port number from the VOLTHA installation.
 
 ```
 curl -s http://localhost:32863/api/v1/logical_devices  | jq .
diff --git a/docs/manuals/user/labtests/T01_tibit_olt_tests_activate_olt.md b/docs/manuals/user/labtests/T01_tibit_olt_tests_activate_olt.md
index f72809e..3e9e349 100644
--- a/docs/manuals/user/labtests/T01_tibit_olt_tests_activate_olt.md
+++ b/docs/manuals/user/labtests/T01_tibit_olt_tests_activate_olt.md
@@ -62,11 +62,11 @@
 * To activate the OLT, execute the following command
 
 ```
-activate_olt
+enable
 ```
 * VOLTHA should initiate a connection and activation request to the Tibit OLT
 * VOLHA will create the logical OpenFlow device and ports and notify ONOS
-* VOLTHA will send an OLT-Activated event notification to the PON Manager 
+* VOLTHA will send an OLT-Activated event notification to the PON Manager
 * VOLTHA will also query the OLT for the number of ONUs connected and attempt
 to activate all ONUs
 * Verify the OLT and ONU status on device console with the following command
@@ -119,7 +119,4 @@
 
 * OLT / ONUs status can be seen from Device Console
 * Confirm OLT and ONUs have "oper_status" of ACTIVE
-* ONUs should continue to drop all the traffic coming from RG 
-
-
-
+* ONUs should continue to drop all the traffic coming from RG
diff --git a/docs/manuals/user/labtests/V03_voltha_bringup_cli.md b/docs/manuals/user/labtests/V03_voltha_bringup_cli.md
index ccc294a..836437f 100644
--- a/docs/manuals/user/labtests/V03_voltha_bringup_cli.md
+++ b/docs/manuals/user/labtests/V03_voltha_bringup_cli.md
@@ -85,7 +85,7 @@
 
 Documented commands (type help <topic>):
 ========================================
-activate_olt  edit     load             preprovision_olt  save       test
+enable        edit     load             preprovision_olt  save       test
 adapters      health   logical_device   py                set
 device        history  logical_devices  reset_history     shell
 devices       launch   pause            restart           shortcuts
@@ -158,13 +158,13 @@
 To activate the last pre-provisioned OLT:
 
 ```
-activate_olt
+enable
 ```
 
 *Example* output:
 
 ```
-(voltha) activate_olt
+(voltha) enable
 activating 5a324e1c3996
 waiting for device to be activated...
 success (logical device id = 1)
@@ -173,13 +173,13 @@
 To activate an OLT given by its ID:
 
 ```
-activate_olt <ID>
+enable <ID>
 ```
 
 *Example* output:
 
 ```
-(voltha) activate_olt
+(voltha) enable
 activating 5a324e1c3996
 waiting for device to be activated...
 success (logical device id = 1)
@@ -433,7 +433,7 @@
 ```
 test
 preprovision_olt -t maple_olt -i 10.11.12.13
-activate_olt
+enable
 install_all_sample_flows
 devices # to see the device IDs
 device 123456789ab