diff --git a/extended/code_update/code_update_utils.robot b/extended/code_update/code_update_utils.robot
index babb8c8..f8d030c 100755
--- a/extended/code_update/code_update_utils.robot
+++ b/extended/code_update/code_update_utils.robot
@@ -90,10 +90,11 @@
     # Example output:
     # root@witherspoon:~# ls -lh /tmp/flashimg
     # -rwxr-xr-x    1 root     root       32.0M Jun 29 01:12 /tmp/flashimg
-    Execute Command On BMC  rm -f /tmp/flashimg
+    BMC Execute Command  rm -f /tmp/flashimg
     scp.Put File  ${image_file_path}  ${targ_file_path}
 
-    ${file_size}=  Execute Command On BMC  ls -lh ${targ_file_path}
+    ${file_size}  ${stderr}  ${rc}=  BMC Execute Command
+    ...  ls -lh ${targ_file_path}
     ${status}=  Run Keyword And Return Status
     ...  Should Contain  ${file_size}  32.0M  msg=Incomplete file transfer.
     [return]  ${status}
@@ -124,7 +125,7 @@
 
     Open Connection And Log In
     ${cmd}=  Set Variable  grep ^VERSION_ID= /etc/os-release | cut -f 2 -d '='
-    ${output}=  Execute Command On BMC  ${cmd}
+    ${output}  ${stderr}  ${rc}=  BMC Execute Command  ${cmd}
     Should Be Equal As Strings  ${version}  ${output[1:-1]}
 
 
diff --git a/extended/test_association.robot b/extended/test_association.robot
index db99e12..e988caf 100755
--- a/extended/test_association.robot
+++ b/extended/test_association.robot
@@ -245,7 +245,7 @@
     #    ]
     # },
 
-    Execute Command On BMC
+    BMC Execute Command
     ...  /tmp/tarball/bin/callout-test ${target_device_path}
 
 Verify Test Error Log And Callout
diff --git a/extended/test_bmc_stress_buster.robot b/extended/test_bmc_stress_buster.robot
index 4eff895..1b19ffe 100644
--- a/extended/test_bmc_stress_buster.robot
+++ b/extended/test_bmc_stress_buster.robot
@@ -66,9 +66,7 @@
 
 SSH Connect And Execute Command
     [Documentation]  Execute SSH command execution operation.
-    Open Connection And Log In
-    Execute Command On BMC  df -h
-    Close Connection
+    BMC Execute Command  df -h
 
 
 IPMI Check Status
diff --git a/extended/test_error_log.robot b/extended/test_error_log.robot
index 1ae7808..4e58575 100644
--- a/extended/test_error_log.robot
+++ b/extended/test_error_log.robot
@@ -59,7 +59,7 @@
 
     Create Test Error Log
     Verify Test Error Log
-    Execute Command On BMC
+    BMC Execute Command
     ...  systemctl restart xyz.openbmc_project.Logging.service
     Sleep  10s  reason=Wait for logging service to restart properly.
     Verify Test Error Log
@@ -92,7 +92,7 @@
     Create Test Error Log
     Verify Test Error Log
     Delete All Error Logs
-    Execute Command On BMC
+    BMC Execute Command
     ...  systemctl restart xyz.openbmc_project.Logging.service
     Sleep  10s  reason=Wait for logging service to restart properly.
     Create Test Error Log
@@ -338,7 +338,7 @@
     Delete Error Logs And Verify
     ${cmd}=  Catenate  for i in {1..201}; do /tmp/tarball/bin/logging-test -c
     ...  AutoTestSimple; done
-    Execute Command On BMC  ${cmd}
+    BMC Execute Command  ${cmd}
     ${count}=  Count Error Entries
     Run Keyword If  ${count} > 200
     ...  Fail  Error logs created exceeded max capacity 200.