Fix test and tag mismatch

Changes:
     - Fixes the mismatch tags and test differences.

Tested:
    - NA
Change-Id: I1c4f184df91200495b601e29c453b814f90d103f
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
index b8c526f..bd40283 100644
--- a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
@@ -100,7 +100,7 @@
 
 Verify Delete Button Should Be Disabled For HTTPS And LDAP Certificates
     [Documentation]  Verify delete buttons should be disabled for HTTPS and LDAP certificates.
-    [Tags]  Verify_Delete_Buttons_Should_Be_Disabled_For_HTTPS_And_LDAP_Certificates
+    [Tags]  Verify_Delete_Button_Should_Be_Disabled_For_HTTPS_And_LDAP_Certificates
     [Setup]  Install CA Certificate
 
     Element Should Be Disabled  ${xpath_delete_ldap_certificate}
@@ -164,7 +164,7 @@
 
 Verify Cancel Button While Deleting The CA Certificate
     [Documentation]  Verify Cancel button while deleting the CA certificate
-    [Tags]  Verify_Cancel_Button_While_Deleting_CA_Certificate
+    [Tags]  Verify_Cancel_Button_While_Deleting_The_CA_Certificate
     [Setup]  Install CA Certificate
 
      Click Element  ${xpath_delete_ca_certificate}
diff --git a/redfish/account_service/test_user_account.robot b/redfish/account_service/test_user_account.robot
index 8a24b9a..4d61c77 100644
--- a/redfish/account_service/test_user_account.robot
+++ b/redfish/account_service/test_user_account.robot
@@ -29,10 +29,9 @@
     Should Be Equal As Strings  ${resp}  ${True}
 
 
-Verify Redfish Admin and ReadOnly Users Persistence After Reboot
+Verify Redfish Admin And ReadOnly Users Persistence After Reboot
     [Documentation]  Verify Redfish admin user persistence after reboot.
-    [Tags]  Verify_Redfish_Admin_User_Persistence_After_Reboot
-    ...    Verify_Redfish_Readonly_User_Persistence_After_Reboot
+    [Tags]  Verify_Redfish_Admin_And_ReadOnly_Users_Persistence_After_Reboot
     [Setup]  Run Keywords  Redfish.Login  AND
     ...  Redfish Create User  admin_user  TestPwd123  Administrator  ${True}
     ...  AND  Redfish Create User  readonly_user  TestPwd123  ReadOnly  ${True}
diff --git a/redfish/telemetry_service/test_telemetry_report.robot b/redfish/telemetry_service/test_telemetry_report.robot
index 1889530..182a41c 100644
--- a/redfish/telemetry_service/test_telemetry_report.robot
+++ b/redfish/telemetry_service/test_telemetry_report.robot
@@ -75,7 +75,7 @@
 
 Verify Telemetry Service MetricReports Unsupported Methods
     [Documentation]  Verify Telemetry Service MetricReports with Unsupported methods.
-    [Tags]  Verify_Telemetry_Service_Metric_Reports_Unsupported_Methods
+    [Tags]  Verify_Telemetry_Service_MetricReports_Unsupported_Methods
 
     Verify Supported And Unsupported Methods    uri=/redfish/v1/TelemetryService/MetricReports