diff --git a/redfish/dmtf_tools/Redfish_Interop_Validator.robot b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
index 3609c3a..8dc3718 100644
--- a/redfish/dmtf_tools/Redfish_Interop_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Interop_Validator.robot
@@ -23,7 +23,7 @@
 ...                --debugging
 ${branch_name}     main
 
-*** Test Case ***
+*** Test Cases ***
 
 Test BMC Redfish Using Redfish Interop Validator
     [Documentation]  Check conformance based on the OpenBMC Interoperability profile.
diff --git a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
index fdba6ae..8f72736 100644
--- a/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
+++ b/redfish/dmtf_tools/Redfish_JsonSchema_ResponseValidator.robot
@@ -16,7 +16,7 @@
 
 ${branch_name}    main
 
-*** Test Case ***
+*** Test Cases ***
 
 Test BMC Redfish Using Redfish JsonSchema ResponseValidator
     [Documentation]  Check OpenBMC conformance with JsonSchema files at the DMTF site.
diff --git a/redfish/dmtf_tools/Redfish_Reference_Checker.robot b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
index 1911171..92f2c3b 100644
--- a/redfish/dmtf_tools/Redfish_Reference_Checker.robot
+++ b/redfish/dmtf_tools/Redfish_Reference_Checker.robot
@@ -20,7 +20,7 @@
 
 ${branch_name}    main
 
-*** Test Case ***
+*** Test Cases ***
 
 Test BMC Redfish Reference
     [Documentation]  Checks for valid reference URLs in CSDL XML files.
diff --git a/redfish/dmtf_tools/Redfish_Service_Validator.robot b/redfish/dmtf_tools/Redfish_Service_Validator.robot
index fa06cb5..acbba0a 100644
--- a/redfish/dmtf_tools/Redfish_Service_Validator.robot
+++ b/redfish/dmtf_tools/Redfish_Service_Validator.robot
@@ -18,7 +18,7 @@
 ...                -p ${OPENBMC_PASSWORD} --logdir ${EXECDIR}${/}logs${/} --debugging
 ${branch_name}    main
 
-*** Test Case ***
+*** Test Cases ***
 
 Test BMC Redfish Using Redfish Service Validator
     [Documentation]  Check conformance with a Redfish service interface.
diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index df989ac..78c5b77 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -31,7 +31,7 @@
 ${state_change_timeout}   3 mins
 ${branch_name}            main
 
-*** Test Case ***
+*** Test Cases ***
 
 Test BMC Redfish Account Management
     [Documentation]  Check Account Management with a Redfish interface.
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 7930a96..3437a3e 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -363,7 +363,7 @@
 
     Delete All Sessions
 
-    [Return]  ${cert_id}
+    RETURN  ${cert_id}
 
 
 Verify Redfishtool Replace Certificate
@@ -435,7 +435,7 @@
 
     ${cmd_output}=  Convert String to JSON  ${cmd_output}
 
-    [Return]  ${cmd_output["CertificateString"]}
+    RETURN  ${cmd_output["CertificateString"]}
 
 
 Suite Setup Execution
diff --git a/redfish/dmtf_tools/test_redfishtool_local_user.robot b/redfish/dmtf_tools/test_redfishtool_local_user.robot
index c6913ab..6e380cd 100644
--- a/redfish/dmtf_tools/test_redfishtool_local_user.robot
+++ b/redfish/dmtf_tools/test_redfishtool_local_user.robot
@@ -247,7 +247,7 @@
     ${status}=  Run Keyword And Return Status  redfishtool Get
     ...  /redfish/v1/AccountService/Accounts/${user_name}
 
-    [return]  ${status}
+    RETURN  ${status}
 
 
 Suite Setup Execution