diff --git a/Makefile b/Makefile
index 4227fda..988b88a 100755
--- a/Makefile
+++ b/Makefile
@@ -268,12 +268,12 @@
 bbsim-multiolt-failurescenarios: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
 bbsim-multiolt-failurescenarios: voltha-test
 
-bbsim-multiolt-kind: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e PhysicalOLTReboot
+bbsim-multiolt-kind: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e MultiOLTPhysicalReboot
 bbsim-multiolt-kind: ROBOT_FILE := Voltha_MultiOLT_Tests.robot
 bbsim-multiolt-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
 bbsim-multiolt-kind: voltha-test
 
-bbsim-multiolt-kind-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e PhysicalOLTReboot
+bbsim-multiolt-kind-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e MultiOLTPhysicalRebootDt
 bbsim-multiolt-kind-dt: ROBOT_FILE := Voltha_DT_MultiOLT_Tests.robot
 bbsim-multiolt-kind-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
 bbsim-multiolt-kind-dt: voltha-dt-test
diff --git a/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot b/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
index 497aa9e..71559f2 100644
--- a/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
+++ b/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
@@ -62,7 +62,7 @@
     ...    Test runs when more than one OLT exists
     ...    Only one OLT is rebooted in the test, while verifying if the ONUs on the
     ...    the other ONUs are still functional
-    [Tags]    functionalDt   MultiOltRebootDt
+    [Tags]    functionalDt   MultiOLTPhysicalRebootDt
     [Setup]    Start Logging    MultiOlt_Physical_Dt
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    MultiOlt_Physical_Dt
diff --git a/tests/functional/Voltha_MultiOLT_Tests.robot b/tests/functional/Voltha_MultiOLT_Tests.robot
index 37b3f36..9f6660b 100644
--- a/tests/functional/Voltha_MultiOLT_Tests.robot
+++ b/tests/functional/Voltha_MultiOLT_Tests.robot
@@ -61,7 +61,7 @@
     ...    Prerequisite : Subscriber are authenticated/DHCP/pingable state
     ...    Test performs a physical reboot on one of the OLTs, performs "reboot" from the OLT CLI
     ...    Validates that ONU on other OLTs are still functional
-    [Tags]    functional   MultiOlt-PhysicalOLTReboot
+    [Tags]    functional   MultiOLTPhysicalReboot
     [Setup]    Start Logging    MultipleOlt-PhysicalOLTReboot
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    MultipleOlt-PhysicalOLTReboot
@@ -118,7 +118,7 @@
     [Documentation]    Test soft reboot of the OLT using voltctl command
     ...     Verifies that when one OLT is rebooted other ONUs on other OLTs are
     ...     still functional
-    [Tags]    MultiOlt-OLTSoftReboot    functional
+    [Tags]    MultiOLTSoftReboot    functional
     [Setup]    Start Logging    MultiOlt-OLTSoftReboot
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    MultiOlt-OLTSoftReboot