diff --git a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
index 4db8bf2..fb0b94f 100644
--- a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
+++ b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
@@ -21,7 +21,7 @@
 
 Verify Navigation To Profile Settings Page
     [Documentation]  Verify navigation to profile settings page.
-    [Tags]  Verify_Navigation_To_Profile_Settings_page
+    [Tags]  Verify_Navigation_To_Profile_Settings_Page
 
     Page Should Contain  Profile settings
 
diff --git a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
index 3a9d122..faa7890 100644
--- a/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
+++ b/gui/gui_test/hardware_status_menu/test_sensors_sub_menu.robot
@@ -28,7 +28,7 @@
 
 Verify Existence Of All Sections In Sensor Page
     [Documentation]  Verify existence of all sections in sensor page.
-    [Tags]  Verify_Existence_Of_All_Sections_In_Event_Logs_Page
+    [Tags]  Verify_Existence_Of_All_Sections_In_Sensor_Page
 
     Page Should Contain  Sensors
 
diff --git a/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot b/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
index 28a8b9b..3c9e97d 100644
--- a/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
+++ b/gui/gui_test/logs_menu/test_event_logs_sub_menu.robot
@@ -46,7 +46,7 @@
     Page Should Contain Element  ${xpath_event_severity_critical}  limit=1
 
 
-Verify Existence Of All Input boxes In Event Logs Page
+Verify Existence Of All Input Boxes In Event Logs Page
     [Documentation]  Verify existence of all input boxes in Event Logs page.
     [Tags]  Verify_Existence_Of_All_Input_Boxes_In_Event_Logs_Page
 
diff --git a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
index 6ba8458..13ed4a5 100644
--- a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
@@ -75,7 +75,7 @@
 
 Verify Existence Of All Input Boxes In Host Os Boot Settings
     [Documentation]  Verify existence of all input boxes in host os boot settings.
-    [Tags]  Verify_Existence_Of_Input_Boxes_In_Host_Os_Boot_Settings
+    [Tags]  Verify_Existence_Of_All_Input_Boxes_In_Host_Os_Boot_Settings
 
     # Added a delay for the page to load boot settings section.
     Wait Until Page Contains  Boot settings  timeout=5
@@ -107,7 +107,7 @@
     ...  AND  Navigate to Server Power Operation Page
 
     Wait Until Keyword Succeeds  15 sec  5 sec   Element Should Contain   ${xpath_current_power_state}  On
-   
+
 Verify PowerOn Button Should Present At Power Off
     [Documentation]  Verify existence of poweron button at power off.
     [Tags]  Verify_PowerOn_Button_Should_Present_At_Power_Off
diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index 444da2b..42def6d 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -84,7 +84,7 @@
 
 Verify Create LDAP Configuration
     [Documentation]  Verify created LDAP configuration.
-    [Tags]  Verify_Created_LDAP_Configuration
+    [Tags]  Verify_Create_LDAP_Configuration
     [Teardown]  Run Keywords  Redfish.Logout  AND  Redfish.Login
 
     Create LDAP Configuration
diff --git a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
index 377f460..07409ab 100644
--- a/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_date_and_time_sub_menu.robot
@@ -32,7 +32,7 @@
 
 Verify Existence Of All Sections In Date And Time Page
     [Documentation]  Verify existence of all sections in date and time page.
-    [Tags]  Verify_Existence_Of_All_Sections_In_Date_And_Time__Page
+    [Tags]  Verify_Existence_Of_All_Sections_In_Date_And_Time_Page
 
     Page Should Contain  Configure settings
 
@@ -72,9 +72,9 @@
     Should contain  ${cli_date_time}  ${manual_date}  ${manual_time}
 
 
-Verify Display Of Date and Time In GUI Page
+Verify Display Of Date And Time In GUI Page
      [Documentation]  Get date and time from Redfish and verify it via GUI date and time page.
-     [Tags]  Verify_Display_Of_Date_And_Time_In_Gui_Page
+     [Tags]  Verify_Display_Of_Date_And_Time_In_GUI_Page
 
     # Set Default timezone in profile settings page.
     Set Timezone In Profile Settings Page  Default
diff --git a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
index 5260465..8b86d45 100644
--- a/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_power_restore_policy_sub_menu.robot
@@ -36,7 +36,7 @@
 
 Verify Existence Of All Buttons In Power Restore Policy Page
     [Documentation]  Verify existence of All Buttons.
-    [Tags]  Verify_Existence_Of_All_Buttons
+    [Tags]  Verify_Existence_Of_All_Buttons_In_Power_Restore_Policy_Page
 
     Page Should Contain Element  ${xpath_AlwaysOn_radio}
     Page Should Contain Element  ${xpath_AlwaysOff_radio}
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index 09394ec..b036aa7 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -50,7 +50,7 @@
 
 Verify Existence Of All Fields In Add Destination
     [Documentation]  Verify existence of all buttons and fields in add destination page.
-    [Tags]  Verify_Existence_Of_All_Button_And_Fields_In_Add_Destination
+    [Tags]  Verify_Existence_Of_All_Fields_In_Add_Destination
     [Teardown]  Run Keywords  Click Button  ${xpath_cancel_button}  AND
     ...  Wait Until Keyword Succeeds  10 sec  5 sec
     ...  Refresh GUI And Verify Element Value  ${xpath_snmp_alerts_heading}  SNMP Alerts
@@ -63,7 +63,7 @@
     Page Should Contain Element  ${xpath_snmp_add_destination_button}
 
 
-Configure SNMP Settings On BMC With NON Default Port Via GUI And Verify
+Configure SNMP Settings On BMC With Non Default Port Via GUI And Verify
     [Documentation]  Configure SNMP settings on BMC with non default port via GUI and verify.
     [Tags]  Configure_SNMP_Settings_On_BMC_With_Non_Default_Port_Via_GUI_And_Verify
     [Teardown]  Delete SNMP Manager Via GUI
@@ -116,7 +116,7 @@
 
 Configure Multiple SNMP Managers On BMC Via GUI And Verify
     [Documentation]  Configure multiple SNMP managers on BMC via GUI and verify.
-    [Tags]  Configure_Multiple_SNMP_Managerss_With_Default_Port_Via_GUI_And_Verify
+    [Tags]  Configure_Multiple_SNMP_Managers_On_BMC_Via_GUI_And_Verify
     [Template]  Configure Multiple SNMP Managers On BMC With Valid Port Via GUI And Verify
 
     # snmp_manager_ip      snmp_port
diff --git a/gui/test/server_config/test_obmc_gui_firmware_update.robot b/gui/test/server_config/test_obmc_gui_firmware_update.robot
index a3af7aa..27f0efc 100644
--- a/gui/test/server_config/test_obmc_gui_firmware_update.robot
+++ b/gui/test/server_config/test_obmc_gui_firmware_update.robot
@@ -61,7 +61,7 @@
     ${PNOR_IMAGE_FILE_PATH}
     [Template]  Upload Firmware using TFTP Server
     [Documentation]  Verify Host image is download from TFTP server.
-    [Tags]  Verify_HOST_Firmware_Download
+    [Tags]  Verify_Host_Firmware_Download
 
 
 *** Keywords ***