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 10e6947..9642af0 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
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation  Test OpenBMC GUI "SSL Certificates" sub-menu of "Access control".
+Documentation  Test OpenBMC GUI "Certificates" sub-menu of "Security and access".
 
 Resource        ../../lib/gui_resource.robot
 Resource        ../../../lib/certificate_utils.robot
@@ -12,9 +12,9 @@
 
 *** Variables ***
 
-${xpath_certificate_heading}       //h1[text()="SSL certificates"]
+${xpath_certificate_heading}       //h1[text()="Certificates"]
 ${xpath_add_certificate_button}    //button[contains(text(),"Add new certificate")]
-${xpath_generate_csr_button}       //*[@data-test-id='sslCertificates-button-generateCsr']
+${xpath_generate_csr_button}       //*[@data-test-id='certificates-button-generateCsr']
 ${xpath_generate_csr_heading}      //h5[contains(text(), "Generate a Certificate Signing Request")]
 ${xpath_select_certificate_type}   //*[@data-test-id='modalGenerateCsr-select-certificateType']
 ${xpath_select_country}            //*[@data-test-id='modalGenerateCsr-select-country']
@@ -33,9 +33,9 @@
 
 *** Test Cases ***
 
-Verify Navigation To SSL Certificate Page
-    [Documentation]  Verify navigation to SSL certificate page.
-    [Tags]  Verify_Navigation_To_SSL_Certificate_Page
+Verify Navigation To Certificate Page
+    [Documentation]  Verify navigation to certificate page.
+    [Tags]  Verify_Navigation_To_Certificate_Page
 
     Page Should Contain Element  ${xpath_certificate_heading}
 
@@ -139,9 +139,9 @@
 Test Setup Execution
     [Documentation]  Do test case setup tasks.
 
-    Click Element  ${xpath_access_control_menu}
-    Click Element  ${xpath_ssl_certificates_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  ssl-certificates
+    Click Element  ${xpath_secuity_and_accesss_menu}
+    Click Element  ${xpath_certificates_sub_menu}
+    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  certificates
 
 
 Suite Setup Execution
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 e298b16..d8ec11d 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
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation  Test OpenBMC GUI "LDAP" sub-menu of "Access control".
+Documentation  Test OpenBMC GUI "LDAP" sub-menu of "Security and access".
 
 Resource        ../../lib/gui_resource.robot
 Resource        ../../../lib/bmc_ldap_utils.robot
@@ -172,8 +172,8 @@
 
     Launch Browser And Login GUI
 
-    # Navigate to https://xx.xx.xx.xx/#/access-control/ldap  LDAP page.
-    Click Element  ${xpath_access_control_menu}
+    # Navigate to https://xx.xx.xx.xx/#/security-and-access/ldap  LDAP page.
+    Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_ldap_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  ldap
     Element Should Be Enabled   ${xpath_enable_ldap_checkbox}
@@ -314,8 +314,8 @@
     # password  The password to be used for login.
 
     Login GUI  ${username}  ${password}
-    # Navigate to https://xx.xx.xx.xx/#/access-control/ldap  LDAP page.
-    Click Element  ${xpath_access_control_menu}
+    # Navigate to https://xx.xx.xx.xx/#/security-and-access/ldap  LDAP page.
+    Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_ldap_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  ldap
 
diff --git a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
index 0980b0c..fa48614 100644
--- a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
+++ b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
@@ -10,10 +10,10 @@
 
 *** Variables ***
 
-${bmc_url}             https://${OPENBMC_HOST}
-${bmc_url_1}           https://${OPENBMC_HOST_1}
-${LDAP_FILE_PATH}      ${EMPTY}
-${CA_FILE_PATH}        ${EMPTY}
+${bmc_url}                     https://${OPENBMC_HOST}
+${bmc_url_1}                   https://${OPENBMC_HOST_1}
+${LDAP_FILE_PATH}              ${EMPTY}
+${CA_FILE_PATH}                ${EMPTY}
 
 ${xpath_add_new_certificate}   //*[contains(text(), ' Add new certificate ')]
 ${xpath_certificate_type}      //*[@id="certificate-type"]
@@ -105,7 +105,7 @@
 Navigate To SSL Certificate Page
     [Documentation]  Navigate to SSL Certificate page.
 
-    Click Element  ${xpath_access_control_menu}
-    Click Element  ${xpath_ssl_certificates_sub_menu}
-    Page Should Contain  SSL certificates
+    Click Element  ${xpath_secuity_and_accesss_menu}
+    Click Element  ${xpath_certificates_sub_menu}
+    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  certificates
 
diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index c999ce9..c5e177a 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation    Test OpenBMC GUI "Security settings" sub-menu of "Server configuration" menu.
+Documentation    Test OpenBMC GUI "Policies" sub-menu of "Security and access" menu.
 
 Resource         ../../lib/gui_resource.robot
 
@@ -11,32 +11,32 @@
 
 *** Variables ***
 
-${xpath_security_settings_heading}  //h1[text()="Security settings"]
-${xpath_bmc_ssh_toggle}             //*[@data-test-id='security-toggle-bmcShell']
-${xpath_network_ipmi_toggle}        //*[@data-test-id='security-toggle-networkIpmi']
+${xpath_policies_heading}           //h1[text()="Policies"]
+${xpath_bmc_ssh_toggle}             //*[@data-test-id='policies-toggle-bmcShell']
+${xpath_network_ipmi_toggle}        //*[@data-test-id='polices-toggle-networkIpmi']
 
 
 *** Test Cases ***
 
-Verify Navigation To Security Settings Page
-    [Documentation]  Verify navigation to security settings page.
-    [Tags]  Verify_Navigation_To_Security_Settings_Page
+Verify Navigation To Policies Page
+    [Documentation]  Verify navigation to Policies page.
+    [Tags]  Verify_Navigation_To_Policies_Page
 
-    Page Should Contain Element  ${xpath_security_settings_heading}
+    Page Should Contain Element  ${xpath_policies_heading}
 
 
-Verify Existence Of All Sections In Security Settings Page
-    [Documentation]  Verify existence of all sections in security settings page.
-    [Tags]  Verify_Existence_Of_All_Sections_In_Security_Settings_Page
+Verify Existence Of All Sections In Policies Page
+    [Documentation]  Verify existence of all sections in policies page.
+    [Tags]  Verify_Existence_Of_All_Sections_In_Policies_Page
 
     Page Should Contain  Network services
     Page Should Contain  BMC shell (via SSH)
     Page Should Contain  Network IPMI (out-of-band IPMI)
 
 
-Verify Existence Of All Buttons In Security Settings Page
-    [Documentation]  Verify existence of All Buttons in security settings page.
-    [Tags]  Verify_Existence_Of_All_Buttons_In_Security_Settings_Page
+Verify Existence Of All Buttons In Policies Page
+    [Documentation]  Verify existence of All Buttons in policies page.
+    [Tags]  Verify_Existence_Of_All_Buttons_In_Policies_Page
 
     Page Should Contain Element  ${xpath_bmc_ssh_toggle}
     Page Should Contain Element  ${xpath_network_ipmi_toggle}
@@ -47,6 +47,6 @@
 Test Setup Execution
     [Documentation]  Do test case setup tasks.
 
-    Click Element  ${xpath_server_configuration}
-    Click Element  ${xpath_security_settings_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  security-settings
+    Click Element  ${xpath_secuity_and_accesss_menu}
+    Click Element  ${xpath_policies_sub_menu}
+    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  policies
diff --git a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
index db9b7fb..36fe289 100644
--- a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation   Test OpenBMC GUI "Client sessions" sub-menu of "Access Control" menu.
+Documentation   Test OpenBMC GUI "Sessions" sub-menu of "Security and access" menu.
 
 Resource        ../../lib/gui_resource.robot
 
@@ -11,16 +11,16 @@
 
 *** Variables ***
 
-${xpath_client_sessions_heading}  //h1[text()="Client sessions"]
+${xpath_sessions_heading}  //h1[text()="Sessions"]
 
 
 *** Test Cases ***
 
-Verify Navigation To Client Sessions Page
-    [Documentation]  Verify navigation to client sessions page.
-    [Tags]  Verify_Navigation_To_Client_Sessions_Page
+Verify Navigation To Sessions Page
+    [Documentation]  Verify navigation to sessions page.
+    [Tags]  Verify_Navigation_To_Sessions_Page
 
-    Page Should Contain Element  ${xpath_client_sessions_heading}
+    Page Should Contain Element  ${xpath_sessions_heading}
 
 
 *** Keywords ***
@@ -28,6 +28,6 @@
 Test Setup Execution
     [Documentation]  Do test case setup tasks.
 
-    Click Element  ${xpath_access_control_menu}
-    Click Element  ${xpath_client_sessions_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  client-sessions
+    Click Element  ${xpath_secuity_and_accesss_menu}
+    Click Element  ${xpath_sessions_sub_menu}
+    Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  sessions
diff --git a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
index e446f54..958bfb6 100644
--- a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 
-Documentation  Test OpenBMC GUI "Local user management" sub-menu of "Access control".
+Documentation  Test OpenBMC GUI "User management" sub-menu of "Security and access".
 
 Resource        ../../lib/gui_resource.robot
 
@@ -10,53 +10,53 @@
 
 
 *** Variables ***
-${xpath_local_user_management_heading }  //h1[text()="Local user management"]
+${xpath_user_management_heading}         //h1[text()="User management"]
 ${xpath_select_user}                     //input[contains(@class,"custom-control-input")]
 ${xpath_account_policy}                  //button[contains(text(),'Account policy settings')]
 ${xpath_add_user}                        //button[contains(text(),'Add user')]
-${xpath_edit_user}                       //*[@data-test-id='localUserManagement-tableRowAction-edit-0']
-${xpath_delete_user}                     //*[@data-test-id='localUserManagement-tableRowAction-delete-1']
-${xpath_account_status_enabled_button}   //*[@data-test-id='localUserManagement-radioButton-statusEnabled']
-${xpath_account_status_disabled_button}  //*[@data-test-id='localUserManagement-radioButton-statusDisabled']
-${xpath_username_input_button}           //*[@data-test-id='localUserManagement-input-username']
-${xpath_privilege_list_button}           //*[@data-test-id='localUserManagement-select-privilege']
-${xpath_password_input_button}           //*[@data-test-id='localUserManagement-input-password']
-${xpath_password_confirm_button}         //*[@data-test-id='localUserManagement-input-passwordConfirmation']
-${xpath_cancel_button}                   //*[@data-test-id='localUserManagement-button-cancel']
-${xpath_submit_button}                   //*[@data-test-id='localUserManagement-button-submit']
+${xpath_edit_user}                       //*[@data-test-id='userManagement-tableRowAction-edit-0']
+${xpath_delete_user}                     //*[@data-test-id='userManagement-tableRowAction-delete-1']
+${xpath_account_status_enabled_button}   //*[@data-test-id='userManagement-radioButton-statusEnabled']
+${xpath_account_status_disabled_button}  //*[@data-test-id='userManagement-radioButton-statusDisabled']
+${xpath_username_input_button}           //*[@data-test-id='userManagement-input-username']
+${xpath_privilege_list_button}           //*[@data-test-id='userManagement-select-privilege']
+${xpath_password_input_button}           //*[@data-test-id='userManagement-input-password']
+${xpath_password_confirm_button}         //*[@data-test-id='userManagement-input-passwordConfirmation']
+${xpath_cancel_button}                   //*[@data-test-id='userManagement-button-cancel']
+${xpath_submit_button}                   //*[@data-test-id='userManagement-button-submit']
 ${xpath_add_user_heading}                //h5[contains(text(),'Add user')]
 ${xpath_policy_settings_header}          //*[text()="Account policy settings"]
-${xpath_auto_unlock}                     //*[@data-test-id='localUserManagement-radio-automaticUnlock']
-${xpath_manual_unlock}                   //*[@data-test-id='localUserManagement-radio-manualUnlock']
-${xpath_max_failed_login}                //*[@data-test-id='localUserManagement-input-lockoutThreshold']
+${xpath_auto_unlock}                     //*[@data-test-id='userManagement-radio-automaticUnlock']
+${xpath_manual_unlock}                   //*[@data-test-id='userManagement-radio-manualUnlock']
+${xpath_max_failed_login}                //*[@data-test-id='userManagement-input-lockoutThreshold']
 ${test_user_password}                    TestPwd1
 
 *** Test Cases ***
 
-Verify Navigation To Local User Management Page
-    [Documentation]  Verify navigation to local user management page.
-    [Tags]  Verify_Navigation_To_Local_User_Management_Page
+Verify Navigation To User Management Page
+    [Documentation]  Verify navigation to user management page.
+    [Tags]  Verify_Navigation_To_User_Management_Page
 
-    Page Should Contain Element  ${xpath_local_user_management_heading}
+    Page Should Contain Element  ${xpath_user_management_heading}
 
 
-Verify Existence Of All Sections In Local User Management Page
-    [Documentation]  Verify existence of all sections in local user management page.
-    [Tags]  Verify_Existence_Of_All_Sections_In_Local_User_Management_Page
+Verify Existence Of All Sections In User Management Page
+    [Documentation]  Verify existence of all sections in user management page.
+    [Tags]  Verify_Existence_Of_All_Sections_In_User_Management_Page
 
     Page should contain  View privilege role descriptions
 
 
-Verify Existence Of All Input Boxes In Local User Management Page
-    [Documentation]  Verify existence of all sections in Manage Power Usage page.
-    [Tags]  Verify_Existence_Of_All_Input_Boxes_In_Local_User_Management_Page
+Verify Existence Of All Input Boxes In User Management Page
+    [Documentation]  Verify existence of all sections in user managemnet page.
+    [Tags]  Verify_Existence_Of_All_Input_Boxes_In_User_Management_Page
 
     Page Should Contain Checkbox  ${xpath_select_user}
 
 
-Verify Existence Of All Buttons In Local User Management Page
-    [Documentation]  Verify existence of all buttons in local user management page.
-    [Tags]  Verify_Existence_Of_All_Buttons_In_Local_User_Management_Page
+Verify Existence Of All Buttons In User Management Page
+    [Documentation]  Verify existence of all buttons in user management page.
+    [Tags]  Verify_Existence_Of_All_Buttons_In_User_Management_Page
 
     Page should contain Button  ${xpath_account_policy}
     Page should contain Button  ${xpath_add_user}
@@ -175,8 +175,8 @@
 Test Setup Execution
     [Documentation]  Do test case setup tasks.
 
-    # Navigate to https://xx.xx.xx.xx/#/access-control/local-user-management  Local users page.
+    # Navigate to https://xx.xx.xx.xx/#/access-control/user-management  user management page.
 
-    Click Element  ${xpath_access_control_menu}
-    Click Element  ${xpath_local_user_management_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  local-user-managemen
+    Click Element  ${xpath_secuity_and_accesss_menu}
+    Click Element  ${xpath_user_management_sub_menu}
+    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  user-managemen