diff --git a/gui/data/gui_variables.py b/gui/data/gui_variables.py
index a4298b6..f112ae7 100644
--- a/gui/data/gui_variables.py
+++ b/gui/data/gui_variables.py
@@ -11,9 +11,9 @@
     """
 
     # Login page
-    xpath_textbox_hostname = "//input[@id='host']"
-    xpath_textbox_username = "//*[@data-test-id='login-input-username']"
-    xpath_textbox_password = "//*[@data-test-id='login-input-password']"
+    xpath_login_hostname_input = "//input[@id='host']"
+    xpath_login_username_input = "//*[@data-test-id='login-input-username']"
+    xpath_login_password_input = "//*[@data-test-id='login-input-password']"
     xpath_login_button = "//*[@data-test-id='login-button-submit']"
     xpath_logout_button = "//*[@data-test-id='appHeader-link-logout']"
 
diff --git a/gui/lib/gui_resource.robot b/gui/lib/gui_resource.robot
index 81216f8..391839d 100644
--- a/gui/lib/gui_resource.robot
+++ b/gui/lib/gui_resource.robot
@@ -90,9 +90,9 @@
     # password  The password to be used for login.
 
     Go To  ${obmc_gui_url}
-    Wait Until Element Is Enabled  ${xpath_textbox_username}
-    Input Text  ${xpath_textbox_username}  ${username}
-    Input Password  ${xpath_textbox_password}  ${password}
+    Wait Until Element Is Enabled  ${xpath_login_username_input}
+    Input Text  ${xpath_login_username_input}  ${username}
+    Input Password  ${xpath_login_password_input}  ${password}
     Click Element  ${xpath_login_button}
     Wait Until Page Contains  Overview  timeout=60s
 
diff --git a/security/test_bmc_connections.robot b/security/test_bmc_connections.robot
index f75e73b..bbc9eb7 100644
--- a/security/test_bmc_connections.robot
+++ b/security/test_bmc_connections.robot
@@ -308,8 +308,8 @@
 Login to GUI With Incorrect Credentials
     [Documentation]  Attempt to login to GUI as root, providing incorrect password argument.
 
-    Input Text  ${xpath_textbox_username}  root
-    Input Password  ${xpath_textbox_password}  incorrect_password
+    Input Text  ${xpath_login_username_input}  root
+    Input Password  ${xpath_login_password_input}  incorrect_password
     Click Button  ${xpath_login_button}
 
 Invalid Credentials Redfish Login Attempts