diff --git a/lib/bmc_redfish_resource.robot b/lib/bmc_redfish_resource.robot
index 3fd13ac..3f222c5 100644
--- a/lib/bmc_redfish_resource.robot
+++ b/lib/bmc_redfish_resource.robot
@@ -4,8 +4,9 @@
 Resource        resource.robot
 Resource        rest_response_code.robot
 Library         bmc_redfish.py  https://${OPENBMC_HOST}:${HTTPS_PORT}  ${OPENBMC_USERNAME}
-...             ${OPENBMC_PASSWORD}  WITH NAME  Redfish
-Library         bmc_redfish_utils.py  WITH NAME  redfish_utils
+...             ${OPENBMC_PASSWORD}  AS  Redfish
+Library         bmc_redfish_utils.py  AS  redfish_utils
 Library         disable_warning_urllib.py
 
+
 *** Keywords ***
diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index 94860d2..12559c4 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -17,7 +17,7 @@
 Library                 bmc_ssh_utils.py
 Library                 utils.py
 Library                 var_funcs.py
-Library                 SCPLibrary  WITH NAME  scp
+Library                 SCPLibrary  AS  scp
 
 *** Variables ***
 
@@ -233,7 +233,7 @@
 
 Copy PNOR to BMC
     [Documentation]  Copy the PNOR image to the BMC.
-    Import Library      SCPLibrary      WITH NAME       scp
+    Import Library      SCPLibrary      AS       scp
     Open Connection for SCP
     Log    Copying ${PNOR_IMAGE_PATH} to /tmp
     scp.Put File    ${PNOR_IMAGE_PATH}   /tmp
@@ -750,7 +750,7 @@
     ...  msg=${tarball_file_path} doesn't exist.
 
     # Upload the file to BMC.
-    Import Library  SCPLibrary  WITH NAME  scp
+    Import Library  SCPLibrary  AS  scp
     Open Connection for SCP
     scp.Put File  ${tarball_file_path}  /tmp/debug-tarball.tar.xz
 
diff --git a/lib/connection_client.robot b/lib/connection_client.robot
index 543879d..97247db 100755
--- a/lib/connection_client.robot
+++ b/lib/connection_client.robot
@@ -55,7 +55,7 @@
 
 Open Connection for SCP
     [Documentation]  Open a connection for SCP.
-    Import Library      SCPLibrary      WITH NAME       scp
+    Import Library      SCPLibrary      AS       scp
     Run Keyword If  '${SSH_PORT}' == '${EMPTY}'  scp.Open connection  ${OPENBMC_HOST}
     ...  username=${OPENBMC_USERNAME}  password=${OPENBMC_PASSWORD}
     ...  ELSE   Run Keyword    scp.Open connection  ${OPENBMC_HOST}  port=${SSH_PORT}
diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 783198f..e2759c2 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -315,7 +315,7 @@
     ...  AND  Return From Keyword
 
     OperatingSystem.File Should Exist  tools/ipmitool  msg=${ipmitool_error}
-    Import Library      SCPLibrary      WITH NAME       scp
+    Import Library      SCPLibrary      AS       scp
     scp.Open connection     ${OPENBMC_HOST}     username=${OPENBMC_USERNAME}      password=${OPENBMC_PASSWORD}
     scp.Put File    tools/ipmitool   /tmp
     SSHLibrary.Open Connection     ${OPENBMC_HOST}
diff --git a/lib/utils.robot b/lib/utils.robot
index 1411e23..448233b 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -20,7 +20,7 @@
 Library                 bmc_ssh_utils.py
 Library                 utils.py
 Library                 var_funcs.py
-Library                 SCPLibrary  WITH NAME  scp
+Library                 SCPLibrary  AS  scp
 Library                 gen_robot_valid.py
 Library                 pldm_utils.py