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
 
diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index 77f57ce..73a0b99 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -44,7 +44,7 @@
 
 Test Get Self Test Results via IPMI Raw Command
     [Documentation]  Get self test results via IPMI raw command and verify the output.
-    [Tags]  Test_Get_Self_Test_Results_via_IPMI
+    [Tags]  Test_Get_Self_Test_Results_via_IPMI_Raw_Command
 
     ${resp}=  Run IPMI Standard Command  raw ${IPMI_RAW_CMD['Self_Test_Results']['Get'][0]}
 
@@ -55,7 +55,7 @@
 
 Test Get Device GUID Via IPMI Raw Command
     [Documentation]  Get device GUID via IPMI raw command and verify it using Redfish.
-    [Tags]  Test_Get_Device_GUID_via_IPMI_and_Verify_via_Redfish
+    [Tags]  Test_Get_Device_GUID_Via_IPMI_Raw_Command
     [Teardown]  Run Keywords  Redfish.Logout  AND  FFDC On Test Case Fail
     # Get GUIDS via IPMI.
     # This should match the /redfish/v1/Managers/bmc's UUID data.
@@ -179,7 +179,7 @@
     0x04                04
 
 
-Verify Set Invalid Session Privilege Level via IPMI Raw Command
+Verify Set Invalid Session Privilege Level Via IPMI Raw Command
     [Documentation]  Verify set invalid session privilege level via IPMI raw command.
     [Tags]  Verify_Set_Invalid_Session_Privilege_Level_Via_IPMI_Raw_Command
     [Template]  Set Invalid Session Privilege Level And Verify
@@ -191,7 +191,7 @@
     0x0F
 
 
-Verify Close Session via IPMI
+Verify Close Session Via IPMI
     [Documentation]  Verify close session via IPMI.
     [Tags]  Verify_Close_Session_Via_IPMI
 
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index b74fe64..cbf1463 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -50,7 +50,7 @@
 
 Disable VLAN Via IPMI When Multiple VLAN Exist On BMC
     [Documentation]  Disable  VLAN Via IPMI When Multiple VLAN Exist On BMC.
-    [Tags]   Disable_VLAN_Via_IPMI_When_LAN_And_VLAN_Exist_On_BMC
+    [Tags]   Disable_VLAN_Via_IPMI_When_Multiple_VLAN_Exist_On_BMC
 
     FOR  ${vlan_id}  IN  @{vlan_ids}
       Create VLAN  ${vlan_id}
diff --git a/ipmi/test_ipmi_network_verificaton.robot b/ipmi/test_ipmi_network_verificaton.robot
index 91ec890..46b5354 100644
--- a/ipmi/test_ipmi_network_verificaton.robot
+++ b/ipmi/test_ipmi_network_verificaton.robot
@@ -20,7 +20,7 @@
 
 Retrieve IP Address Via IPMI And Verify Using Redfish
     [Documentation]  Retrieve IP address using IPMI and verify using Redfish.
-    [Tags]  Retrieve_IP_Address_Via_IPMI_And_Verify_Using_Redish
+    [Tags]  Retrieve_IP_Address_Via_IPMI_And_Verify_Using_Redfish
 
     ${active_channel_config}=  Get Active Channel Config
     FOR  ${channel_number}  IN  @{active_channel_config.keys()}
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 2b73730..a2878f3 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -87,7 +87,7 @@
 
 Verify IPMI User Creation With Valid Name And ID
     [Documentation]  Create user via IPMI and verify.
-    [Tags]  Test_IPMI_User_Creation_With_Valid_Name_And_ID
+    [Tags]  Verify_IPMI_User_Creation_With_Valid_Name_And_ID
     [Teardown]  Run Keywords  FFDC On Test Case Fail  AND
     ...  Delete Created User  ${random_userid}
 
diff --git a/network/test_vlan_network.robot b/network/test_vlan_network.robot
index 884b2cc..9f683c1 100644
--- a/network/test_vlan_network.robot
+++ b/network/test_vlan_network.robot
@@ -156,7 +156,7 @@
 
 Delete Multiple IPs On VLAN And Verify
     [Documentation]  Delete multiple IPs on VLAN and verify each via REST and IPMI.
-    [Tags]  Delete_Multiple_IP_On_VLAN_Via_REST
+    [Tags]  Delete_Multiple_IPs_On_VLAN_And_Verify
     [Setup]  Run Keywords  Test Setup Execution  AND  Create VLAN  ${vlan_id}
     [Teardown]  Delete VLANs  [${vlan_id}]
 
diff --git a/pldm/test_pldm_bios_attributes.robot b/pldm/test_pldm_bios_attributes.robot
index 74626a6..08ba923 100755
--- a/pldm/test_pldm_bios_attributes.robot
+++ b/pldm/test_pldm_bios_attributes.robot
@@ -170,7 +170,7 @@
     [Documentation]  Verify set BIOS enumeration attribute type for various BIOS
     ...              attribute handle with random values with in the range of
     ...              default optional values.
-    [Tags]  Verify_BIOS_Enumeration_Attribute_Type
+    [Tags]  Verify_Set_BIOS_Enumeration_Attribute_Type
 
     ${attr_val_data}=  GetBIOSEnumAttributeOptionalValues  ${attr_table_data}
 
diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index 2cf2241..f966b80 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -48,7 +48,7 @@
 
 Expire And Change Root User Password And Access Via SSH
     [Documentation]   Expire and change root user password and access via SSH.
-    [Tags]  Expire_Root_User_Password_And_Access_Via_SSH
+    [Tags]  Expire_And_Change_Root_User_Password_And_Access_Via_SSH
     [Teardown]  Run Keywords  Wait Until Keyword Succeeds  1 min  10 sec
     ...  Restore Default Password For Root User  AND  FFDC On Test Case Fail
 
diff --git a/snmp/test_bmc_snmp_config.robot b/snmp/test_bmc_snmp_config.robot
index 743f12d..a6ba5c5 100644
--- a/snmp/test_bmc_snmp_config.robot
+++ b/snmp/test_bmc_snmp_config.robot
@@ -43,7 +43,7 @@
 
     Delete SNMP Manager And Object  ${SNMP_MGR1_IP}  ${SNMP_DEFAULT_PORT}
 
-Configure SNMP Manager On BMC With Non-default Port And Verify
+Configure SNMP Manager On BMC With Non Default Port And Verify
     [Documentation]  Configure SNMP Manager On BMC And Verify.
     [Tags]  Configure_SNMP_Manager_On_BMC_With_Non_Default_Port_And_Verify
 
@@ -104,7 +104,7 @@
     Delete SNMP Manager And Object  ${SNMP_MGR1_IP}  ${SNMP_DEFAULT_PORT}
     Delete SNMP Manager And Object  ${SNMP_MGR2_IP}  ${SNMP_DEFAULT_PORT}
 
-Configure Multiple SNMP Managers With Non-default Port And Verify
+Configure Multiple SNMP Managers With Non Default Port And Verify
     [Documentation]  Configure multiple SNMP Managers with non-default port And Verify.
     [Tags]  Configure_Multiple_SNMP_Managers_With_Non_Default_Port_And_Verify
 
diff --git a/xcat/test_power_operation.robot b/xcat/test_power_operation.robot
index b2155d3..22d40f1 100644
--- a/xcat/test_power_operation.robot
+++ b/xcat/test_power_operation.robot
@@ -30,7 +30,7 @@
     Wait Until Keyword Succeeds  6 min  10 sec  Is Host Off
 
 
-Verify BMC State via XCAT
+Verify BMC State Via XCAT
     [Documentation]  Verify BMC state using REST and XCAT.
     [Tags]  Verify_BMC_State_Via_XCAT
 
diff --git a/xcat/test_xcat_group.robot b/xcat/test_xcat_group.robot
index a82795f..1a553d7 100644
--- a/xcat/test_xcat_group.robot
+++ b/xcat/test_xcat_group.robot
@@ -53,7 +53,7 @@
 
 Add Nodes To Group List
     [Documentation]  Add BMC nodes into group.
-    [Tags]  Move_Added_Nodes_To_Group
+    [Tags]  Add_Nodes_To_Group_List
 
     # Add BMC nodes to group and validate.
     FOR  ${bmc}  IN  @{BMC_LIST}
@@ -110,7 +110,7 @@
 Continuous Node Power Status
     [Documentation]  Continuously get the power status.
     # This keyword verifies the REST connectivity between XCAT and the BMC node.
-    [Tags]  Continuos_Node_Power_Status
+    [Tags]  Continuous_Node_Power_Status
 
     # Performing this operation only on one BMC node.
 
@@ -150,7 +150,7 @@
     END
 
 
-Get Fanspeed Via XCAT
+Get Fanspeed Reading Via XCAT
     [Documentation]  Get fanspeed via XCAT.
     [Tags]  Get_Fanspeed_Reading_Via_XCAT
 
@@ -171,7 +171,7 @@
 
 Get Voltage Reading Via XCAT
     [Documentation]  Get voltage via XCAT.
-    [Tags]  Get_Voltage_Via_XCAT
+    [Tags]  Get_Voltage_Reading_Via_XCAT
 
     # Sample output of the keyword:
     # node1: No attributes returned from the BMC.