diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index 78c5b77..6e96cb2 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -51,7 +51,7 @@
     @{failed_tc_list}=    Create List
 
     FOR  ${result}  IN  @{result_list}
-       ${rc}=    evaluate    'ErrorMessages'=='${result}'
+       ${rc}=  Evaluate  'ErrorMessages'=='${result}'
        ${num}=  Run Keyword If  ${rc} == False  Set Variable  ${result_list["${result}"]["fail"]}
        Run Keyword If  ${num} != None and ${num} > 0  Append To List  ${failed_tc_list}   ${result}
     END
@@ -99,7 +99,7 @@
     @{error_messages}=    Create List
 
     FOR  ${result}  IN  @{result_list}
-       ${rc}=    evaluate    'ErrorMessages'=='${result}'
+       ${rc}=  Evaluate  'ErrorMessages'=='${result}'
        ${num}=  Run Keyword If  ${rc} == False  Set Variable  ${result_list["${result}"]["fail"]}
        Run Keyword If  ${num} != None and ${num} > 0  Append To List  ${failed_tc_list}   ${result}
        Run Keyword If  ${rc} == True   Set Variable
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index bd59cf4..1febefa 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -291,7 +291,7 @@
     [Arguments]  ${delete_cert}=${True}
 
     ${cmd_output}=  Redfishtool Get  /redfish/v1/Managers/${MANAGER_ID}/Truststore/Certificates
-    ${cmd_output}=  Convert String to JSON  ${cmd_output}
+    ${cmd_output}=  Convert String To JSON  ${cmd_output}
     ${cert_list}=  Set Variable  ${cmd_output["Members"]}
     ${uri_length}=  Get Length  ${cert_list}
     ${file_status}=  Set Variable If
@@ -430,10 +430,10 @@
     # expected_error  Expected error optionally provided in testcase (e.g. 401 /
     #                 authentication error, etc. ).
 
-    ${rc}  ${cmd_output}=  Run and Return RC and Output  ${cmd_args} GET ${uri}
-    Run Keyword If  ${rc} != 0  Is HTTP error Expected  ${cmd_output}  ${expected_error}
+    ${rc}  ${cmd_output}=  Run And Return RC And Output  ${cmd_args} GET ${uri}
+    Run Keyword If  ${rc} != 0  Is HTTP Error Expected  ${cmd_output}  ${expected_error}
 
-    ${cmd_output}=  Convert String to JSON  ${cmd_output}
+    ${cmd_output}=  Convert String To JSON  ${cmd_output}
 
     RETURN  ${cmd_output["CertificateString"]}
 
diff --git a/redfish/dmtf_tools/test_redfishtool_local_user.robot b/redfish/dmtf_tools/test_redfishtool_local_user.robot
index e00e4d3..ed046e3 100644
--- a/redfish/dmtf_tools/test_redfishtool_local_user.robot
+++ b/redfish/dmtf_tools/test_redfishtool_local_user.robot
@@ -234,7 +234,7 @@
 
     ${user_account}=  Redfishtool Get  /redfish/v1/AccountService/Accounts/${user_name}
     ${json_obj}=   Evaluate  json.loads('''${user_account}''')  json
-    Should Be equal  "${json_obj["RoleId"]}"  ${role}
+    Should Be Equal  "${json_obj["RoleId"]}"  ${role}
 
 
 Redfishtool Verify User Name Exists