diff --git a/openpower/check_error_logs.robot b/openpower/check_error_logs.robot
index 177ac19..f828e9a 100644
--- a/openpower/check_error_logs.robot
+++ b/openpower/check_error_logs.robot
@@ -17,7 +17,7 @@
 
 Collect Error Logs
     [Documentation]  Check error logs with Redfish.
-    [Tags]  check_errors
+    [Tags]  Collect_Error_Logs
     [Setup]  Redfish.Login
     [Teardown]  Redfish Test Teardown Execution
 
diff --git a/openpower/check_vpd_and_hw_status.robot b/openpower/check_vpd_and_hw_status.robot
index 8b2a174..a07aae4 100644
--- a/openpower/check_vpd_and_hw_status.robot
+++ b/openpower/check_vpd_and_hw_status.robot
@@ -17,7 +17,7 @@
 
 Collect VPD And Hardware Status
     [Documentation]  Collect VPD and hardware status using Redfish.
-    [Tags]  collect_vpd
+    [Tags]  Collect_VPD_And_Hardware_Status
     [Setup]  Redfish.Login
     [Teardown]  Redfish Test Teardown Execution
 
@@ -31,7 +31,7 @@
 
 Run VPD Tool
     [Documentation]  Run vpd-tool -i.
-    [Tags]  run_vpd_tool
+    [Tags]  Run_VPD_Tool
 
     BMC Execute Command  vpd-tool -i  print_out=${1}
 
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index cb83d6c..0bc0a17 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -187,7 +187,7 @@
 
 Enable DHCP When Static IP Configured And Verify Static IP
     [Documentation]  Enable DHCP when static ip configured and verify static ip
-    [Tags]  Enable_DHCP_when_Static_IP_Configured_And_Verify_Static_IP
+    [Tags]  Enable_DHCP_When_Static_IP_Configured_And_Verify_Static_IP
     [Setup]  Redfish Power On
     [Teardown]  Test Teardown Execution
 
@@ -293,7 +293,7 @@
 
 Verify To Update VMI Static IP Address With Different User Roles
     [Documentation]  Verify to update vmi static IP address with different user roles.
-    [Tags]  Verify_To_Update_VMI_Static_IP_Address_With_Different_User_Roles_And_Verify
+    [Tags]  Verify_To_Update_VMI_Static_IP_Address_With_Different_User_Roles
     [Setup]  Create Users With Different Roles  users=${USERS}  force=${True}
     [Template]  Config VMI Static IP Address Using Different Users
     [Teardown]  Delete BMC Users Using Redfish
@@ -307,7 +307,7 @@
 
 Verify To Read VMI Network Configuration With Different User Roles
     [Documentation]  Verify to read vmi network configuration with different user roles.
-    [Tags]  Verify_To_Read_VMI_Network_Configuration_Via_Different_User_Roles
+    [Tags]  Verify_To_Read_VMI_Network_Configuration_With_Different_User_Roles
     [Setup]  Create Users With Different Roles  users=${USERS}  force=${True}
     [Template]  Read VMI Static IP Address Using Different Users
     [Teardown]  Delete BMC Users Using Redfish
@@ -347,7 +347,7 @@
 
 Enable And Disable DHCP And Verify
     [Documentation]  verify enable DHCP and disable DHCP.
-    [Tags]  Enabled_And_Disabled_DHCP_Verify
+    [Tags]  Enable_And_Disable_DHCP_And_Verify
 
     Set VMI IPv4 Origin  ${True}
     ${default}=  Set Variable  0.0.0.0
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index 4c2a998..949cd4a 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -46,9 +46,9 @@
     noaccess_user        TestPwd123           ${False}      ${True}    ${HTTP_FORBIDDEN}
 
 
-Get Root Certificate Using Different Privilege Users Roles
+Get Root Certificate Using Different Privilege Users Role
     [Documentation]  Get root certificate using different users.
-    [Tags]  Get_Root_Certificate_Using_Different_Users
+    [Tags]  Get_Root_Certificate_Using_Different_Privilege_Users_Role
     [Template]  Get Root Certificate
 
     # username     password    force_create  valid_csr  valid_status_code
@@ -67,7 +67,7 @@
 
 Send CSR Request When VMI Is Off And Verify
     [Documentation]  Send CSR signing request to VMI when it is off and expect an error.
-    [Tags]  Get_CSR_Request_When_VMI_Is_Off_And_verify
+    [Tags]  Send_CSR_Request_When_VMI_Is_Off_And_Verify
     [Setup]  Redfish Power Off
     [Teardown]  Run keywords  Redfish Power On  stack_mode=skip  AND  FFDC On Test Case Fail
     [Template]  Get Certificate Signed By VMI
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index bbf50a7..0c035a6 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -509,7 +509,7 @@
 
 Verify Error Logging Rotation Policy With All Types Of Errors
     [Documentation]  Verify error logging rotation policy with all types of errors.
-    [Tags]  Verify_Error_Logging_Rotation_Policy_With_All_Types_Errors
+    [Tags]  Verify_Error_Logging_Rotation_Policy_With_All_Types_Of_Errors
     [Template]  Error Logging Rotation Policy
 
     # Error logs to be created                                           % of total logging space when error
@@ -580,7 +580,7 @@
 
 Verify Reverse Order Of PEL Logs
     [Documentation]  Verify PEL command to output PEL logs in reverse order.
-    [Tags]  Verify_Reverse_PEL_Logs
+    [Tags]  Verify_Reverse_Order_Of_PEL_Logs
 
     Redfish Purge Event Log
 
diff --git a/openpower/ras/test_bmc_ras.robot b/openpower/ras/test_bmc_ras.robot
index 305743b..81c56d6 100755
--- a/openpower/ras/test_bmc_ras.robot
+++ b/openpower/ras/test_bmc_ras.robot
@@ -298,7 +298,7 @@
 Verify Pdbg Recoverable Callout Handling For CoreFIR With Threshold 1
     [Documentation]  Verify recoverable callout handling for CoreFIR
     ...              with threshold 1 using pdbg tool.
-    [Tags]  Verify_Pdbg_Recoverable_Callout_CoreFIR_Handling_For_With_Threshold_1
+    [Tags]  Verify_Pdbg_Recoverable_Callout_Handling_For_CoreFIR_With_Threshold_1
 
     ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  COREFIR_RECV1
     ${translated_fir}=  Fetch FIR Address Translation Value  ${value[0]}  EX
diff --git a/openpower/ras/test_host_ras.robot b/openpower/ras/test_host_ras.robot
index 18acb42..c5edd3d 100755
--- a/openpower/ras/test_host_ras.robot
+++ b/openpower/ras/test_host_ras.robot
@@ -291,7 +291,7 @@
 Verify Recoverable Callout Handling For CoreFIR With Threshold 1
     [Documentation]  Verify recoverable callout handling for CoreFIR with
     ...              threshold 1.
-    [Tags]  Verify_Recoverable_Callout_CoreFIR_Handling_For_With_Threshold_1
+    [Tags]  Verify_Recoverable_Callout_Handling_For_CoreFIR_With_Threshold_1
 
     ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  COREFIR_RECV1
     ${translated_fir}=  Fetch FIR Address Translation Value  ${value[0]}  EX
diff --git a/openpower/ras/test_reboot_ras.robot b/openpower/ras/test_reboot_ras.robot
index b4e6c1c..c031e8a 100755
--- a/openpower/ras/test_reboot_ras.robot
+++ b/openpower/ras/test_reboot_ras.robot
@@ -19,7 +19,7 @@
 *** Test Cases ***
 Verify Host Unrecoverable Callout Handling At Reboot
     [Documentation]  Verify host unrecoverable callout handling at reboot.
-    [Tags]  Verify_Unrecoverable_Callout_Handling_At_Reboot
+    [Tags]  Verify_Host_Unrecoverable_Callout_Handling_At_Reboot
 
     ${value}=  Get From Dictionary  ${ERROR_INJECT_DICT}  L2FIR_UE
     ${translated_fir}=  Fetch FIR Address Translation Value  ${value[0]}  EX
diff --git a/openpower/test_bios_attributes.robot b/openpower/test_bios_attributes.robot
index 460ff58..91caa12 100755
--- a/openpower/test_bios_attributes.robot
+++ b/openpower/test_bios_attributes.robot
@@ -110,7 +110,7 @@
 
     [Documentation]  Validate get and update BIOS attribute optional values
     ...              and set back to original BIOS attribute values using Redfish.
-    [Tags]  Redfish_Verify_BIOS_Enumeration_Attribute_Type
+    [Tags]  Redfish_Verify_Set_BIOS_Enumeration_Attribute_Type
 
 
     # Fetch BIOS attribute optional values from pldmtool getbiostable.