diff --git a/redfish/service_root/test_service_root.robot b/redfish/service_root/test_service_root.robot
index 5957336..a5df8c7 100644
--- a/redfish/service_root/test_service_root.robot
+++ b/redfish/service_root/test_service_root.robot
@@ -4,17 +4,17 @@
 
 *** Test Cases ***
 
-Login And Logout BMCweb
+Redfish Login And Logout
     [Documentation]  Login to BMCweb and then logout.
-    [Tags]  Login_And_Logout_BMCweb
+    [Tags]  Redfish_Login_And_Logout
 
     redfish.Login
     redfish.Logout
 
 
-GET BMCweb Hypermedia Without Login
+GET Redfish Hypermedia Without Login
     [Documentation]  GET hypermedia URL without login.
-    [Tags]  GET_BMCweb_Hypermedia_Without_Login
+    [Tags]  GET_Redfish_Hypermedia_Without_Login
     [Template]  GET And Verify Redfish Response
 
     # Expect status      Resource URL Path
@@ -23,9 +23,9 @@
     ${HTTP_OK}           /redfish/v1
 
 
-GET SessionService Resource With Login
+GET Redfish SessionService Resource With Login
     [Documentation]  Login to BMCweb and get /redfish/v1/SessionService.
-    [Tags]  GET_SessionService_Resource_With_Login
+    [Tags]  GET_Redfish_SessionService_Resource_With_Login
 
     redfish.Login
     ${resp}=  redfish.Get  /redfish/v1/SessionService
@@ -33,17 +33,17 @@
     redfish.Logout
 
 
-GET SessionService Without Login
+GET Redfish SessionService Without Login
     [Documentation]  Get /redfish/v1/SessionService without login
-    [Tags]  GET_SessionService_Without_Login
+    [Tags]  GET_Redfish_SessionService_Without_Login
 
     ${resp}=  redfish.Get  /redfish/v1/SessionService
     Should Be Equal As Strings  ${resp.status}  ${HTTP_UNAUTHORIZED}
 
 
-Login Using Invalid Token
+Redfish Login Using Invalid Token
     [Documentation]  Login to BMCweb with invalid token.
-    [Tags]  Login_Using_Invalid_Token
+    [Tags]  Redfish_Login_Using_Invalid_Token
 
     Create Session  openbmc  ${AUTH_URI}
 
@@ -57,9 +57,9 @@
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_UNAUTHORIZED}
 
 
-Delete Session Using Valid login
+Delete Redfish Session Using Valid login
     [Documentation]  Delete a session using valid login.
-    [Tags]  Delete_Session_Using_Valid_Login
+    [Tags]  Delete_Redfish_Session_Using_Valid_Login
 
     redfish.Login
 
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index a5ec38d..285f5da 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -4,9 +4,9 @@
 
 *** Test Cases ***
 
-Login To BMCweb With Invalid Credentials
+Redfish Login With Invalid Credentials
     [Documentation]  Login to BMC web using invalid credential.
-    [Tags]  Login_To_BMCweb_With_Invalid_Credentials
+    [Tags]  Redfish_Login_With_Invalid_Credentials
     [Template]  Login And Verify Redfish Response
 
     # Expect status            Username               Password
@@ -17,9 +17,9 @@
     InvalidCredentialsError*   ${EMPTY}               ${EMPTY}
 
 
-Login To BMCweb Using Unsecured HTTP
+Redfish Login Using Unsecured HTTP
     [Documentation]  Login to BMC web through http unsecured.
-    [Tags]  Login_To_BMCweb_Using_Unsecured_HTTP
+    [Tags]  Redfish_Login_Using_Unsecured_HTTP
 
     Create Session  openbmc  http://${OPENBMC_HOST}
     ${data}=  Create Dictionary