diff --git a/openpower/ext_interfaces/test_client_identifier.robot b/openpower/ext_interfaces/test_client_identifier.robot
index 6f80365..194be6a 100644
--- a/openpower/ext_interfaces/test_client_identifier.robot
+++ b/openpower/ext_interfaces/test_client_identifier.robot
@@ -154,7 +154,7 @@
       Append To List  ${session_list}  ${resp}
     END
 
-    [Return]  ${session_list}
+    RETURN  ${session_list}
 
 
 Verify A Non Admin Session Created With ClientID
diff --git a/openpower/ext_interfaces/test_discovery.robot b/openpower/ext_interfaces/test_discovery.robot
index 59d8b84..9854eeb 100644
--- a/openpower/ext_interfaces/test_discovery.robot
+++ b/openpower/ext_interfaces/test_discovery.robot
@@ -138,7 +138,7 @@
     Print Timen  Exception message is ${exc_msg}
     Should Not Be Empty  ${bmc_list}
     Rprint Vars  bmc_list
-    [Return]  ${bmc_list}
+    RETURN  ${bmc_list}
 
 
 Verify Existence Of BMC Record From List
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index c96789a..9fe0b70 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -358,7 +358,7 @@
     Set To Dictionary  ${session_info}  SessionIDs  ${session['Id']}
     Set To Dictionary  ${session_info}  ClientID  ${session["Context"]}
 
-    [Return]  ${session_info}
+    RETURN  ${session_info}
 
 
 RW General Dictionary
@@ -378,7 +378,7 @@
 
     Set To Dictionary  ${request_dict}  ResourceID  ${res_id}
 
-    [Return]  ${request_dict}
+    RETURN  ${request_dict}
 
 
 Return Description Of Response
@@ -395,7 +395,7 @@
 
     ${message}=  Evaluate  json.loads('''${resp_text}''')  json
 
-    [Return]  ${message}
+    RETURN  ${message}
 
 
 Verify Redfish Session Deleted
@@ -469,7 +469,7 @@
     ...  ELSE
     ...    Run Keyword And Return  Return Description Of Response  ${resp.content}
 
-    [Return]  ${resp}
+    RETURN  ${resp}
 
 
 Redfish Post Acquire List Lock
@@ -492,7 +492,7 @@
     ...  ELSE
     ...    Run Keyword And Return  Return Description Of Response  ${resp.content}
 
-    [Return]  ${resp}
+    RETURN  ${resp}
 
 
 Redfish Post Acquire Invalid Lock
@@ -512,7 +512,7 @@
     Run Keyword If  '${message}' != '${EMPTY}'
     ...  Valid Value  message  ['${resp.content}']
 
-    [Return]  ${resp}
+    RETURN  ${resp}
 
 
 Redfish Post Acquire Invalid Lock With Invalid Data Type Of Resource ID
@@ -530,7 +530,7 @@
     ...  /ibm/v1/HMC/LockService/Actions/LockService.AcquireLock  data=${lock_dict_param}
     Should Be Equal As Strings  ${resp.status_code}  ${status_code}
 
-    [Return]  ${resp}
+    RETURN  ${resp}
 
 
 Form Data To Acquire Lock
@@ -547,7 +547,7 @@
     ${temp_list}=  Create List  ${resp}
     ${lock_request_dict}=  Create Dictionary  Request=${temp_list}
 
-    [Return]  ${lock_request_dict}
+    RETURN  ${lock_request_dict}
 
 
 Create Data To Acquire List Of Lock
@@ -569,7 +569,7 @@
 
     ${lock_request_dict}=  Create Dictionary  Request=${temp_list}
 
-    [Return]  ${lock_request_dict}
+    RETURN  ${lock_request_dict}
 
 
 Form Data To Acquire Invalid Lock With Invalid Data Type Of Resource ID
@@ -586,7 +586,7 @@
     ${temp_list}=  Create List  ${resp}
     ${lock_request_dict}=  Create Dictionary  Request=${temp_list}
 
-    [Return]  ${lock_request_dict}
+    RETURN  ${lock_request_dict}
 
 
 Form Data To Acquire Invalid Lock
@@ -603,7 +603,7 @@
     ${temp_list}=  Create List  ${resp}
     ${lock_request_dict}=  Create Dictionary  Request=${temp_list}
 
-    [Return]  ${lock_request_dict}
+    RETURN  ${lock_request_dict}
 
 
 Get Locks List On Resource
@@ -619,7 +619,7 @@
     ...  data=${data}
     ${locks}=  Evaluate  json.loads('''${resp.text}''')  json
 
-    [Return]  ${locks["Records"]}
+    RETURN  ${locks["Records"]}
 
 
 Verify Lock On Resource
@@ -694,7 +694,7 @@
       Append To List  ${tran_ids}  ${item['TransactionID']}
     END
 
-    [Return]  ${tran_ids}
+    RETURN  ${tran_ids}
 
 
 Release Locks On Resource
@@ -1237,7 +1237,7 @@
 
     ${session_id_list}=  Evaluate  json.dumps(${session_id_list})  json
 
-    [Return]  ${session_id_list}
+    RETURN  ${session_id_list}
 
 
 Get Locks List On Resource With Session List
@@ -1253,7 +1253,7 @@
     Should Be Equal As Strings  ${resp.status_code}  ${exp_status_code}
     ${locks}=  Evaluate  json.loads('''${resp.text}''')  json
 
-    [Return]  ${locks}
+    RETURN  ${locks}
 
 
 Verify List Of Session Lock On Resource
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index c251093..5493d62 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -411,7 +411,7 @@
     Return From Keyword If  '${status}' == 'False'  ${resp_text}
     ${message}=  Evaluate  json.loads('''${resp_text}''')  json
 
-    [Return]  ${message["Description"]}
+    RETURN  ${message["Description"]}
 
 
 Upload Partition File To BMC
@@ -631,7 +631,7 @@
        Set To Dictionary  ${content_dict}  ${conf_file}  ${content-${index}}
     END
 
-    [Return]  &{content_dict}
+    RETURN  &{content_dict}
 
 
 Redfish Read Partition File
@@ -747,7 +747,7 @@
     FOR  ${count}  IN RANGE  ${range}
       Append To List  ${file_name_list}  1KB-file${count}
     END
-    [Return]  ${file_name_list}
+    RETURN  ${file_name_list}
 
 
 Redfish Upload Partition File With Range
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index a7be41d..f036d5f 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -523,7 +523,7 @@
     ${value}=  Set Variable If  '${parameter}' != 'DHCPEnabled'   ${ip_resp["${parameter}"]}
     ...  ${ip_resp["DHCPv4"]["${parameter}"]}
 
-    [Return]  ${value}
+    RETURN  ${value}
 
 
 Switch VMI IPv4 Origin And Verify Details
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index 05de1d2..b5927ae 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -590,7 +590,7 @@
     ${output}=  Run  ${ssl_cmd} ${ssl_sub}
     ${csr}=  OperatingSystem.Get File  ${CSR_FILE}
 
-    [Return]  ${csr}
+    RETURN  ${csr}
 
 
 Send CSR To VMI And Get Signed
@@ -619,7 +619,7 @@
     ...  timeout=${read_timeout}  expected_status=any
     Log to console  ${resp.content}
 
-    [Return]  ${resp}
+    RETURN  ${resp}
 
 
 Get Root Certificate
@@ -669,7 +669,7 @@
     ...   ELSE
     ...     Run  openssl x509 -in ${file_name} -text -noout | grep Subject:
 
-    [Return]  ${subject}
+    RETURN  ${subject}
 
 
 Get Public Key
@@ -683,7 +683,7 @@
     ${PublicKey}=  Run Keyword If  ${is_csr_file}  Run  openssl req -in ${file_name} -noout -pubkey
     ...   ELSE  Run  openssl x509 -in ${file_name} -noout -pubkey
 
-    [Return]  ${PublicKey}
+    RETURN  ${PublicKey}
 
 
 Get Certificate Signed By VMI
diff --git a/openpower/ipmi/test_ipmi_sdr.robot b/openpower/ipmi/test_ipmi_sdr.robot
index 04886ec..c1f9322 100755
--- a/openpower/ipmi/test_ipmi_sdr.robot
+++ b/openpower/ipmi/test_ipmi_sdr.robot
@@ -54,7 +54,7 @@
     ${component_uris}=  Get Matches  ${uri_list}
     ...  regexp=^.*[0-9a-z_].${component_name}\[_0-9a-z]*$
     ...  case_insensitive=${True}
-    [Return]  ${component_uris}
+    RETURN  ${component_uris}
 
 
 Get SDR Presence Via IPMI
@@ -89,7 +89,7 @@
 
     ${presence_ipmi}=  Fetch From Right  ${sdr_component_line}  |
     ${presence_ipmi}=  Strip String  ${presence_ipmi}
-    [Return]  ${presence_ipmi}
+    RETURN  ${presence_ipmi}
 
 
 Get SDR Record ID
@@ -98,7 +98,7 @@
     ${resp}=  Run External IPMI Standard Command  sdr elist
     ${record_id}=  Get Regexp Matches  ${resp}  \\|\\s+([0-9]+)h\\s+\\|  1
 
-    [Return]  ${record_id[0]}
+    RETURN  ${record_id[0]}
 
 
 Suite Setup Execution
diff --git a/openpower/localuser/test_ipmi_redfish_user.robot b/openpower/localuser/test_ipmi_redfish_user.robot
index da56462..9bdb551 100644
--- a/openpower/localuser/test_ipmi_redfish_user.robot
+++ b/openpower/localuser/test_ipmi_redfish_user.robot
@@ -189,7 +189,7 @@
     Run Keyword If  '${privilege}' != '0'
     ...  Set Channel Access  ${random_userid}  ipmi=on privilege=${privilege}
 
-    [Return]  ${random_username}  ${random_userid}
+    RETURN  ${random_username}  ${random_userid}
 
 
 Delete Users Via Redfish
@@ -253,5 +253,5 @@
         Exit For Loop If  ${is_empty} == ${True}
     END
     Run Keyword If  '${index}' == '299'  Fail  msg=A free user ID could not be found.
-    [Return]  ${random_userid}
+    RETURN  ${random_userid}
 
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index 3c0ae78..aa2dbb3 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -834,7 +834,7 @@
     # Logging disk capacity limit is set to 20MB. So calculating the log usage percentage.
     ${usage_percent}=  Evaluate  ${usage_output} / 20 * 100
 
-    [return]  ${usage_percent}
+    RETURN  ${usage_percent}
 
 
 Get PEL Log IDs
@@ -881,7 +881,7 @@
     END
     Sort List  ${pel_id_list}
 
-    [Return]  ${pel_id_list}
+    RETURN  ${pel_id_list}
 
 
 Get PEL Log Via BMC CLI
@@ -891,7 +891,7 @@
     ${ids}=  Get Dictionary Keys  ${pel_records}
     Sort List  ${ids}
 
-    [Return]  ${ids}
+    RETURN  ${ids}
 
 
 Get PEL Field Value
@@ -932,7 +932,7 @@
     ${pel_section_output}=  Get From Dictionary  ${pel_output}  ${pel_section}
     ${pel_field_output}=  Get From Dictionary  ${pel_section_output}  ${pel_field}
 
-    [Return]  ${pel_field_output}
+    RETURN  ${pel_field_output}
 
 
 Verify PEL Transmission To Host
diff --git a/openpower/ras/ras_utils.robot b/openpower/ras/ras_utils.robot
index 8ee6102..ce3ee0b 100755
--- a/openpower/ras/ras_utils.robot
+++ b/openpower/ras/ras_utils.robot
@@ -150,7 +150,7 @@
     ${translated_fir_addr}=  FIR Address Translation Through HOST
     ...  ${fir_address}  ${core_id}  ${target_type}
 
-    [Return]  ${translated_fir_addr}
+    RETURN  ${translated_fir_addr}
 
 RAS Test SetUp
     [Documentation]  Validates input parameters.
diff --git a/openpower/test_timed_power_on.robot b/openpower/test_timed_power_on.robot
index 2f24511..05167e8 100644
--- a/openpower/test_timed_power_on.robot
+++ b/openpower/test_timed_power_on.robot
@@ -137,7 +137,7 @@
     ${time_set}=  Evaluate  ${current_bmc_time[0]} + ${TIMER_POWER_ON}
     BMC Execute Command  ${CMD_SET_TPO_TIME} ${time_set}
 
-    [Return]  ${time_set}
+    RETURN  ${time_set}
 
 
 Get Time Power ON Value
@@ -148,4 +148,4 @@
     ${return_value}=  Evaluate  ${return_value}[1]
 
     # BMC command returns integer value.
-    [Return]  ${return_value}
+    RETURN  ${return_value}