diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index f62555b..0501a35 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -11,7 +11,7 @@
 Suite Setup      Suite Setup Execution
 Suite Teardown   LDAP Suite Teardown Execution
 Test Teardown    Run Keywords  Redfish.Login  AND  FFDC On Test Case Fail
-Force Tags       LDAP_Test
+Force Tags       Ldap_Configuration
 
 *** Variables ***
 ${old_ldap_privilege}   Administrator
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 467d2e8..b59d5b1 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -29,7 +29,7 @@
 # Force the test to timedout to prevent test hanging.
 Test Timeout             30 minutes
 
-Force Tags               BMC_Code_Update
+Force Tags               Bmc_Code_Update
 
 *** Variables ***
 
diff --git a/redfish/extended/test_power_restore.robot b/redfish/extended/test_power_restore.robot
index 0ca0923..c84854d 100644
--- a/redfish/extended/test_power_restore.robot
+++ b/redfish/extended/test_power_restore.robot
@@ -17,7 +17,7 @@
 Test Teardown   Test Teardown Execution
 Suite Teardown  Suite Teardown Execution
 
-Force Tags      power_restore
+Force Tags      Power_Restore
 
 *** Variables ***
 
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index fbc4cc3..c9b61c4 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -13,7 +13,7 @@
 Test Setup      Test Setup Execution
 Test Teardown   Test Teardown Execution
 
-Force Tags     Network_Conf_Test
+Force Tags     Bmc_Network_Conf
 
 *** Variables ***
 ${test_hostname}           openbmc
diff --git a/redfish/managers/test_bmc_network_mac.robot b/redfish/managers/test_bmc_network_mac.robot
index fdc2159..8bf4626 100644
--- a/redfish/managers/test_bmc_network_mac.robot
+++ b/redfish/managers/test_bmc_network_mac.robot
@@ -9,7 +9,7 @@
 Suite Setup    Suite Setup Execution
 Test Teardown  Test Teardown Execution
 
-Force Tags     MAC_Test
+Force Tags     Bmc_Network_Mac
 
 *** Variables ***
 
diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index e7e70d1..e71a33a 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -7,7 +7,7 @@
 Resource         ../../lib/certificate_utils.robot
 Library          String
 
-Force Tags       Certificate_Test
+Force Tags       Certificate
 
 Suite Setup      Suite Setup Execution
 Suite Teardown   Suite Teardown
diff --git a/redfish/systems/eventlog/test_esel.robot b/redfish/systems/eventlog/test_esel.robot
index 7381f6e..c1414d9 100644
--- a/redfish/systems/eventlog/test_esel.robot
+++ b/redfish/systems/eventlog/test_esel.robot
@@ -15,7 +15,7 @@
 Test Setup          Test Setup Execution
 Test Teardown       FFDC On Test Case Fail
 
-Force Tags  eSEL_Logging
+Force Tags  eSEL
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_bmc_image_switch.robot b/redfish/update_service/test_bmc_image_switch.robot
index 9904334..77e839e 100755
--- a/redfish/update_service/test_bmc_image_switch.robot
+++ b/redfish/update_service/test_bmc_image_switch.robot
@@ -11,7 +11,7 @@
 Suite Teardown           Run Keyword And Ignore Error  Redfish.Logout
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags    Test_BMC_Image_Switch
+Force Tags               Bmc_Image_Switch
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_firmware_tftp_upload_image.robot b/redfish/update_service/test_firmware_tftp_upload_image.robot
index 7680d83..3caeeb3 100644
--- a/redfish/update_service/test_firmware_tftp_upload_image.robot
+++ b/redfish/update_service/test_firmware_tftp_upload_image.robot
@@ -26,7 +26,7 @@
 Test Setup       Run Keywords  Redfish Power Off  stack_mode=skip  quiet=1  AND  Redfish.Login
 Test Teardown    FFDC On Test Case Fail
 
-Force Tags       tftp_update
+Force Tags       Firmware_Tftp_Upload_Image
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index 8f177e3..b02441e 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -31,7 +31,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               BMC_Code_Update
+Force Tags               Redfish_Bmc_Code_Update
 
 *** Variables ***
 
diff --git a/redfish/update_service/test_redfish_host_code_update.robot b/redfish/update_service/test_redfish_host_code_update.robot
index e4d78c8..db00ad9 100644
--- a/redfish/update_service/test_redfish_host_code_update.robot
+++ b/redfish/update_service/test_redfish_host_code_update.robot
@@ -27,7 +27,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags               Host_Code_Update
+Force Tags               Redfish_Host_Code_Update
 
 *** Test Cases ***
 
diff --git a/redfish/update_service/test_redfish_image_upload.robot b/redfish/update_service/test_redfish_image_upload.robot
index 75ba8a0..ebb6936 100644
--- a/redfish/update_service/test_redfish_image_upload.robot
+++ b/redfish/update_service/test_redfish_image_upload.robot
@@ -33,7 +33,7 @@
 Test Setup             Printn
 Test Teardown          Test Teardown Execution
 
-Force Tags  Upload_Test
+Force Tags             Redfish_Image_Upload
 
 *** Variables ***
 ${timeout}             20
diff --git a/redfish/update_service/test_redfish_signed_image_update.robot b/redfish/update_service/test_redfish_signed_image_update.robot
index 1c3779a..72d6518 100755
--- a/redfish/update_service/test_redfish_signed_image_update.robot
+++ b/redfish/update_service/test_redfish_signed_image_update.robot
@@ -25,7 +25,7 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
-Force Tags   Signed_Upload_Test
+Force Tags               Redfish_Signed_Image_Update
 
 *** Variables ***
 
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index 8640d5b..d2a121f 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -21,9 +21,9 @@
 # Skip org code update.
 --exclude Initiate_Code_Update_BMC
 --exclude BIOS_Code_Update
---exclude Upload_Test
---exclude BMC_Code_Update
---exclude Host_Code_Update
+--exclude Redfish_Image_Upload
+--exclude Bmc_Code_Update
+--exclude Redfish_Host_Code_Update
 --exclude BMC_Update_Recoverable_Error
 --exclude Host_Update_Recoverable_Error
 --exclude BMC_Multi_Code_Update
@@ -71,4 +71,4 @@
 # Remote logging
 --exclude Verify_BMC_Journald_Contains_No_Credential_Data
 # Non bmcweb certificate.
---exclude Certificate_Test
+--exclude Certificate
diff --git a/test_lists/witherspoon/regression_bucket_master b/test_lists/witherspoon/regression_bucket_master
index a5a463b..ede2fb5 100644
--- a/test_lists/witherspoon/regression_bucket_master
+++ b/test_lists/witherspoon/regression_bucket_master
@@ -52,7 +52,7 @@
 --include Verify_operator_User_Privilege
 --include Verify_User_User_Privilege
 # Certificate
---include Certificate_Test
+--include Certificate
 # Network test cases(non-disruptive)
 --include Get_IP_Address_And_Verify
 --include Get_Netmask_And_Verify
diff --git a/test_lists/witherspoon/skip_inband_ipmi b/test_lists/witherspoon/skip_inband_ipmi
index 6af4437..a1ec0e9 100755
--- a/test_lists/witherspoon/skip_inband_ipmi
+++ b/test_lists/witherspoon/skip_inband_ipmi
@@ -2,4 +2,4 @@
 --exclude Verify_Disabling_And_Enabling_IPMI_Via_Host
 --exclude Verify_Disabling_IPMI_Via_OOB_IPMI
 --exclude Verify_IPMI_Disable_Persistency_After_BMC_Reboot
---exclude eSEL_Logging
+--exclude eSEL