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