diff --git a/lib/state.py b/lib/state.py
index 298d344..ac53e56 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -334,7 +334,7 @@
 
         if must_login:
             # Open SSH connection to OS.
-            cmd_buf = ["Open Connection", os_host]
+            cmd_buf = ["SSHLibrary.Open Connection", os_host]
             if not quiet:
                 grp.rpissuing_keyword(cmd_buf)
             ix = BuiltIn().run_keyword(*cmd_buf)
diff --git a/lib/utils.robot b/lib/utils.robot
index 001f3e2..9951c49 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -120,11 +120,11 @@
     # os_username  The username to be used to sign in to the OS.
     # os_password  The password to be used to sign in to the OS.
 
-    Open connection  ${os_host}
+    SSHLibrary.Open connection  ${os_host}
     Login  ${os_username}  ${os_password}
     ${cmd_buf}  Catenate  shutdown
     Start Command  ${cmd_buf}
-    Close Connection
+    SSHLibrary.Close Connection
 
 Initiate OS Host Reboot
     [Documentation]  Initiate an OS reboot.
@@ -136,11 +136,11 @@
     # os_username  The username to be used to sign in to the OS.
     # os_password  The password to be used to sign in to the OS.
 
-    Open connection  ${os_host}
+    SSHLibrary.Open connection  ${os_host}
     Login  ${os_username}  ${os_password}
     ${cmd_buf}  Catenate  reboot
     Start Command  ${cmd_buf}
-    Close Connection
+    SSHLibrary.Close Connection
 
 Initiate Auto Reboot
     [Documentation]  Initiate an auto reboot.
@@ -148,7 +148,7 @@
     # Set the auto reboot policy.
     Set Auto Reboot  yes
 
-    Open connection  ${openbmc_host}
+    SSHLibrary.Open connection  ${openbmc_host}
     Login  ${openbmc_username}  ${openbmc_password}
 
     # Set the watchdog timer.  Note: 5000 = milliseconds which is 5 seconds.
@@ -187,7 +187,7 @@
     [Arguments]  ${os_host}=${OS_HOST}  ${os_username}=${OS_USERNAME}
     ...          ${os_password}=${OS_PASSWORD}  ${quiet}=${QUIET}
     ...          ${print_string}=${EMPTY}
-    [Teardown]  Close Connection
+    [Teardown]  SSHLibrary.Close Connection
 
     # os_host           The DNS name/IP of the OS host associated with our BMC.
     # os_username       The username to be used to sign on to the OS host.
@@ -200,7 +200,7 @@
     # Attempt to ping the OS. Store the return code to check later.
     ${ping_rc}=  Run Keyword and Return Status  Ping Host  ${os_host}
 
-    Open connection  ${os_host}
+    SSHLibrary.Open connection  ${os_host}
 
     ${status}  ${msg}=  Run Keyword And Ignore Error  Login  ${os_username}
     ...  ${os_password}