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