diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index 3bfeca4..ec9cf03 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -89,7 +89,7 @@
 
 Verify LDAP Config Update With Incorrect AuthenticationType
     [Documentation]  Verify that invalid AuthenticationType is not updated.
-    [Tags]  Verify_LDAP_Update_With_Incorrect_AuthenticationType
+    [Tags]  Verify_LDAP_Config_Update_With_Incorrect_AuthenticationType
 
     ${body}=  Catenate  {'${ldap_type}': {'Authentication': {'AuthenticationType':'KerberosKeytab'}}}
 
@@ -299,7 +299,7 @@
     Redfish Verify LDAP Login
 
 
-Verify Authorization With Null Privilege
+Verify LDAP Authorization With Null Privilege
     [Documentation]  Verify the failure of LDAP authorization with empty
     ...  privilege.
     [Tags]  Verify_LDAP_Authorization_With_Null_Privilege
@@ -309,7 +309,7 @@
     ...  [${HTTP_FORBIDDEN}]
 
 
-Verify Authorization With Invalid Privilege
+Verify LDAP Authorization With Invalid Privilege
     [Documentation]  Verify that LDAP user authorization with wrong privilege
     ...  fails.
     [Tags]  Verify_LDAP_Authorization_With_Invalid_Privilege
@@ -512,7 +512,7 @@
 
 Read Network Configuration Via Different User Roles And Verify
     [Documentation]  Read network configuration via different user roles and verify.
-    [Tags]  Read_Network_configuration_Via_Different_User_Roles_And_Verify
+    [Tags]  Read_Network_Configuration_Via_Different_User_Roles_And_Verify
     [Teardown]  Restore LDAP Privilege
 
     [Template]  Update LDAP User Role And Read Network Configuration
diff --git a/redfish/account_service/test_user_account.robot b/redfish/account_service/test_user_account.robot
index d38492a..dd69b0a 100644
--- a/redfish/account_service/test_user_account.robot
+++ b/redfish/account_service/test_user_account.robot
@@ -215,7 +215,7 @@
 
 Verify Operator User Privilege
     [Documentation]  Verify operator user privilege.
-    [Tags]  Verify_operator_User_Privilege
+    [Tags]  Verify_Operator_User_Privilege
 
     Redfish Create User  admin_user  TestPwd123  Administrator  ${True}
     Redfish Create User  operator_user  TestPwd123  Operator  ${True}
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 8fbf5d6..5c84b62 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -129,7 +129,7 @@
 
 Install Server Certificate Using Redfishtool And Verify Via OpenSSL
     [Documentation]  Install server certificate using Redfishtool and verify via OpenSSL.
-    [Tags]  Install_Server_Certificate_Using_Redfishtool_And_Verify_Via_OpenSSL.
+    [Tags]  Install_Server_Certificate_Using_Redfishtool_And_Verify_Via_OpenSSL
 
     ${cert_file_path}=  Generate Certificate File Via Openssl  Valid Certificate Valid Privatekey
     ${bytes}=  OperatingSystem.Get Binary File  ${cert_file_path}
diff --git a/redfish/events/test_bmc_snmp_trap.robot b/redfish/events/test_bmc_snmp_trap.robot
index 26b1a4c..b9953a2 100644
--- a/redfish/events/test_bmc_snmp_trap.robot
+++ b/redfish/events/test_bmc_snmp_trap.robot
@@ -27,7 +27,7 @@
     Verify SNMP Manager Configured On BMC  ${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
     [Teardown]  Delete SNMP Manager Via Redfish  ${SNMP_MGR1_IP}  ${NON_DEFAULT_PORT1}
@@ -144,7 +144,7 @@
     Should Be True  ${uptime} <= 1  msg=SNMP SysUpTime is not reset on reboot
 
 
-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
     [Teardown]  Run Keywords
diff --git a/redfish/extended/test_bmc_devicetree.robot b/redfish/extended/test_bmc_devicetree.robot
index 3a40158..9888966 100644
--- a/redfish/extended/test_bmc_devicetree.robot
+++ b/redfish/extended/test_bmc_devicetree.robot
@@ -87,7 +87,7 @@
    gpio-fsi/compatible
 
 
-Check BMC GPIO-FSI Name Property Is Set
+Check BMC GPIO FSI Name Property Is Set
    [Documentation]  Verify if the BMC GPIO-FSI name property is populated.
    [Tags]  Check_BMC_GPIO_FSI_Name_Property_Is_Set
    [Template]  Template Check Property
@@ -96,7 +96,7 @@
    gpio-fsi/name
 
 
-Check BMC GPIO-FSI Compatible Property Is Set
+Check BMC GPIO FSI Compatible Property Is Set
    [Documentation]  Verify if the BMC GPIO-FSI compatible property is populated.
    [Tags]  Check_BMC_GPIO_FSI_Compatible_Property_Is_Set
    [Template]  Template Check Property
@@ -105,20 +105,20 @@
    gpio-fsi/compatible
 
 
-Check BMC GPIO-keys Name Property Is Set
+Check BMC GPIO Keys Name Property Is Set
    [Documentation]  Verify if the BMC GPIO-keys name property is
    ...  populated.
-   [Tags]  Check_BMC_GPIO_keys_Name_Property_Is_Set
+   [Tags]  Check_BMC_GPIO_Keys_Name_Property_Is_Set
    [Template]  Template Check Property
 
    #Property
    gpio-keys/name
 
 
-Check BMC GPIO-keys Compatible Property Is Set
+Check BMC GPIO Keys Compatible Property Is Set
    [Documentation]  Verify if the BMC GPIO-keys compatible property is
    ...  populated.
-   [Tags]  Check_BMC_GPIO_keys_Compatible_Property_Is_Set
+   [Tags]  Check_BMC_GPIO_Keys_Compatible_Property_Is_Set
    [Template]  Template Check Property
 
    #Property
diff --git a/redfish/extended/test_escale_base.robot b/redfish/extended/test_escale_base.robot
index f3f7008..040581d 100755
--- a/redfish/extended/test_escale_base.robot
+++ b/redfish/extended/test_escale_base.robot
@@ -34,7 +34,7 @@
 
 Escale Base Test Inactive Monitoring
     [Documentation]  Run base power tests with DCMI power monitoring off.
-    [Tags]  Escale_Base_Test_Deactive_Monitoring
+    [Tags]  Escale_Base_Test_Inactive_Monitoring
 
     Deactivate DCMI Power And Verify
     Verify Power Limits
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index ad8bdfe..3cb88a5 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -286,7 +286,7 @@
 
 Configure Threshold Netmask And Verify
     [Documentation]  Configure threshold netmask and verify.
-    [Tags]  Configure_Threshold_Netmask_And_verify
+    [Tags]  Configure_Threshold_Netmask_And_Verify
     [Teardown]  Run Keywords
     ...   Delete IP Address  ${test_ipv4_addr}  AND  Test Teardown Execution
 
@@ -294,7 +294,7 @@
 
 Configure Lowest Netmask And Verify
     [Documentation]  Configure lowest netmask and verify.
-    [Tags]  Configure_Lowest_Netmask_And_verify
+    [Tags]  Configure_Lowest_Netmask_And_Verify
     [Teardown]  Run Keywords
     ...   Delete IP Address  ${test_ipv4_addr}  AND  Test Teardown Execution
 
@@ -488,7 +488,7 @@
 
 Configure Invalid Values For DNS Server
     [Documentation]  Configure invalid values for DNS server and expect an error.
-    [Tags]  Configure_Invalid_Value_For_DNS_Server
+    [Tags]  Configure_Invalid_Values_For_DNS_Server
     [Setup]  DNS Test Setup Execution
     [Template]  Configure Static Name Servers
     [Teardown]  Run Keywords
diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 6a444d4..5c378c5 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -79,7 +79,7 @@
     Redfish.Logout
 
 
-Delete Redfish Session Using Valid login
+Delete Redfish Session Using Valid Login
     [Documentation]  Delete a session using valid login.
     [Tags]  Delete_Redfish_Session_Using_Valid_Login
 
diff --git a/redfish/systems/test_power_operations.robot b/redfish/systems/test_power_operations.robot
index 3cbcbc1..928d59c 100644
--- a/redfish/systems/test_power_operations.robot
+++ b/redfish/systems/test_power_operations.robot
@@ -33,7 +33,7 @@
     Verify OCC State
 
 
-Verify Redfish BMC PowerOn
+Verify Redfish Host PowerOn
     [Documentation]  Verify Redfish host power on operation.
     [Tags]  Verify_Redfish_Host_PowerOn
 
@@ -45,14 +45,14 @@
     Run Keyword If  ${additional_power_check} == ${1}  Power Check
 
 
-Verify Redfish BMC GracefulRestart
+Verify Redfish Host GracefulRestart
     [Documentation]  Verify Redfish host graceful restart operation.
     [Tags]  Verify_Redfish_Host_GracefulRestart
 
     RF SYS GracefulRestart
 
 
-Verify Redfish BMC PowerOff
+Verify Redfish Host PowerOff
     [Documentation]  Verify Redfish host power off operation.
     [Tags]  Verify_Redfish_Host_PowerOff
 
diff --git a/redfish/systems/test_powersubsystem_settings.robot b/redfish/systems/test_powersubsystem_settings.robot
index ec62703..bb45fd0 100755
--- a/redfish/systems/test_powersubsystem_settings.robot
+++ b/redfish/systems/test_powersubsystem_settings.robot
@@ -50,7 +50,7 @@
     Valid List  allowed_power_modes  valid_values=${VALID_POWER_MODES}
 
 
-Verify Allowable Power Mode Settings Switch
+Verify Allowable Power Mode Settings Switch At Runtime
     [Documentation]  Check the allowable power modes are set successfully at runtime.
     [Tags]  Verify_Allowable_Power_Mode_Settings_Switch_At_Runtime
     [Template]  Set and Verify Power Mode Switches
@@ -83,7 +83,7 @@
 
 Verify PowerSubsystem Efficiency Percent For All PowerSupplies
     [Documentation]  Verify the efficiency percent for all powersupplies.
-    [Tags]  Verify_PowerSubsystem_Efficiency_Percent_For_PowerSupplies
+    [Tags]  Verify_PowerSubsystem_Efficiency_Percent_For_All_PowerSupplies
 
     ${total_num_supplies}=  Get Total Number Of PowerSupplies
     Rprint Vars  total_num_supplies
diff --git a/redfish/update_service/test_firmware_inventory.robot b/redfish/update_service/test_firmware_inventory.robot
index cae879b..24b1aad 100644
--- a/redfish/update_service/test_firmware_inventory.robot
+++ b/redfish/update_service/test_firmware_inventory.robot
@@ -14,7 +14,7 @@
 
 Verify Redfish Update Service Enabled
     [Documentation]  Verify "ServiceEnabled" is enabled.
-    [Tags]  Verify_Update_Service_Enabled
+    [Tags]  Verify_Redfish_Update_Service_Enabled
 
     # Example:
     # "HttpPushUri": "/redfish/v1/UpdateService",
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index b732aa3..34e39d7 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -66,7 +66,7 @@
 
 Verify If The Modified Admin Credential Is Valid Post Image Switched To Backup
     [Documentation]  Verify updated admin credential remain same post switch to back up image.
-    [Tags]  Verify_If_The_Modified_Admin_Credentials_Is_Valid_Backup_Image
+    [Tags]  Verify_If_The_Modified_Admin_Credential_Is_Valid_Post_Image_Switched_To_Backup
     [Setup]  Create Users With Different Roles  users=${USERS}  force=${True}
     [Teardown]  Run Keywords  Redfish.Login  AND  Delete BMC Users Via Redfish  users=${USERS}
 
@@ -86,7 +86,7 @@
 
 Verify If The Modified Admin Credential Is Valid Post Update
     [Documentation]  Verify updated admin credential remain same post code update image.
-    [Tags]  Verify_If_The_Modified_Admin_Credentials_Is_Valid_Post_Update
+    [Tags]  Verify_If_The_Modified_Admin_Credential_Is_Valid_Post_Update
     [Setup]  Create Users With Different Roles  users=${USERS}  force=${True}
     [Teardown]  Run Keywords  Redfish.Login  AND  Delete BMC Users Via Redfish  users=${USERS}
 
diff --git a/redfish/update_service/test_redfish_image_upload.robot b/redfish/update_service/test_redfish_image_upload.robot
index 6f7b374..105a0a0 100644
--- a/redfish/update_service/test_redfish_image_upload.robot
+++ b/redfish/update_service/test_redfish_image_upload.robot
@@ -38,7 +38,7 @@
 
 *** Test Cases ***
 
-Redfish Failure to Upload BMC Image With Bad Manifest
+Redfish Failure To Upload BMC Image With Bad Manifest
     [Documentation]  Upload a BMC firmware with a bad MANFIEST file.
     [Tags]  Redfish_Failure_To_Upload_BMC_Image_With_Bad_Manifest
     [Template]  Redfish Bad Firmware Update
@@ -47,7 +47,7 @@
     bmc_bad_manifest.ubi.mtd.tar
 
 
-Redfish Failure to Upload Empty BMC Image
+Redfish Failure To Upload Empty BMC Image
     [Documentation]  Upload a BMC firmware with no kernel image.
     [Tags]  Redfish_Failure_To_Upload_Empty_BMC_Image
     [Template]  Redfish Bad Firmware Update
@@ -56,7 +56,7 @@
     bmc_nokernel_image.ubi.mtd.tar
 
 
-Redfish Failure to Upload Host Image With Bad Manifest
+Redfish Failure To Upload Host Image With Bad Manifest
     [Documentation]  Upload a PNOR firmware with a bad MANIFEST file.
     [Tags]  Redfish_Failure_To_Upload_Host_Image_With_Bad_Manifest
     [Template]  Redfish Bad Firmware Update
@@ -65,7 +65,7 @@
     pnor_bad_manifest.pnor.squashfs.tar
 
 
-Redfish Failure to Upload Empty Host Image
+Redfish Failure To Upload Empty Host Image
     [Documentation]  Upload a PNOR firmware with no kernel Image.
     [Tags]  Redfish_Failure_To_Upload_Empty_Host_Image
     [Template]  Redfish Bad Firmware Update
@@ -74,7 +74,7 @@
     pnor_nokernel_image.pnor.squashfs.tar
 
 
-Redfish TFTP Failure to Upload BMC Image With Bad Manifest
+Redfish TFTP Failure To Upload BMC Image With Bad Manifest
     [Documentation]  Upload a BMC firmware with a bad MANFIEST file via TFTP.
     [Tags]  Redfish_TFTP_Failure_To_Upload_BMC_Image_With_Bad_Manifest
     [Template]  Redfish TFTP Bad Firmware Update
@@ -83,7 +83,7 @@
     bmc_bad_manifest.ubi.mtd.tar
 
 
-Redfish TFTP Failure to Upload Empty BMC Image
+Redfish TFTP Failure To Upload Empty BMC Image
     [Documentation]  Upload a BMC firmware with no kernel image via TFTP.
     [Tags]  Redfish_TFTP_Failure_To_Upload_Empty_BMC_Image
     [Template]  Redfish TFTP Bad Firmware Update
@@ -92,7 +92,7 @@
     bmc_nokernel_image.ubi.mtd.tar
 
 
-Redfish TFTP Failure to Upload Host Image With Bad Manifest
+Redfish TFTP Failure To Upload Host Image With Bad Manifest
     [Documentation]  Upload a PNOR firmware with a bad MANIFEST file via TFTP.
     [Tags]  Redfish_TFTP_Failure_To_Upload_Host_Image_With_Bad_Manifest
     [Template]  Redfish TFTP Bad Firmware Update
@@ -101,7 +101,7 @@
     pnor_bad_manifest.pnor.squashfs.tar
 
 
-Redfish TFTP Failure to Upload Empty Host Image
+Redfish TFTP Failure To Upload Empty Host Image
     [Documentation]  Upload a PNOR firmware with no kernel Image via TFTP.
     [Tags]  Redfish_TFTP_Failure_To_Upload_Empty_Host_Image
     [Template]  Redfish TFTP Bad Firmware Update