diff --git a/extended/code_update/test_field_mode.robot b/extended/code_update/test_field_mode.robot
index 47bd16b..44b0795 100644
--- a/extended/code_update/test_field_mode.robot
+++ b/extended/code_update/test_field_mode.robot
@@ -42,7 +42,7 @@
 Attempt To Disable Field Mode Via REST And Verify
     [Documentation]  Attempt to disable field mode with REST and verify that
     ...              it remains enabled.
-    [Tags]  Attempt_To_Disable_Field_Mode_Via_REST
+    [Tags]  Attempt_To_Disable_Field_Mode_Via_REST_And_Verify
 
     # This test case doesn't actually disable field mode. It attempts to, but
     # verifies that the FieldModeEnabled property keeps its value of '1'
diff --git a/extended/code_update/test_software_manager.robot b/extended/code_update/test_software_manager.robot
index bdb43ab..5925616 100755
--- a/extended/code_update/test_software_manager.robot
+++ b/extended/code_update/test_software_manager.robot
@@ -19,7 +19,7 @@
 Verify Software Purposes
     [Documentation]  Verify that all software objects have a valid 'Purpose'
     ...              field.
-    [Tags]  Verify_Software_Purpose
+    [Tags]  Verify_Software_Purposes
 
     ${object_uris}=  Read Properties  ${SOFTWARE_VERSION_URI}list
 
@@ -106,7 +106,7 @@
 Host Software RequestedActivation
     [Documentation]  Veriify host images have valid 'RequestedActivation'
     ...  properties.
-    [Tags]  BMC_Software_RequestedActivation
+    [Tags]  Host_Software_RequestedActivation
     [Template]  Verify Software RequestedActivation
 
     # Software Purpose
diff --git a/extended/obmc_boot_test.robot b/extended/obmc_boot_test.robot
index a33a3c8..7259051 100644
--- a/extended/obmc_boot_test.robot
+++ b/extended/obmc_boot_test.robot
@@ -8,7 +8,7 @@
 *** Test Cases ***
 General Boot Testing
     [Documentation]  Performs repeated boot tests.
-    [Tags]  General_boot_testing
+    [Tags]  General_Boot_Testing
     [Teardown]  Test Teardown
 
     OBMC Boot Test
diff --git a/extended/test_watchdog.robot b/extended/test_watchdog.robot
index d800191..c15f7f1 100644
--- a/extended/test_watchdog.robot
+++ b/extended/test_watchdog.robot
@@ -71,7 +71,7 @@
     Should Be Equal As Strings  ${modified_time_interval}  ${random_int}
 
 
-Modify and verify Watchdog TimeRemaining
+Modify And Verify Watchdog TimeRemaining
     [Documentation]  Modify and verify watchdog 'TimeRemaining'.
     [Tags]  Modify_And_Verify_Watchdog_TimeRemaining