diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index 35f9e85..35953c7 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -29,7 +29,7 @@
 
     Description of argument(s):
     image_type                     This value is either BMC update or Host update type.
-    sw_dict                        This contain dictionay of firmware inventory properties.
+    sw_dict                        This contain dictionary of firmware inventory properties.
     """
 
     temp_dict = collections.OrderedDict()
diff --git a/lib/common_utils.robot b/lib/common_utils.robot
index daaf139..e9bbfaa 100755
--- a/lib/common_utils.robot
+++ b/lib/common_utils.robot
@@ -712,7 +712,7 @@
 Configure Initial Settings
     [Documentation]  Restore old IP and route.
     ...  This keyword requires initial settings viz IP address,
-    ...  Network Mask, default gatway and serial console IP and port
+    ...  Network Mask, default gateway and serial console IP and port
     ...  information which should be provided in command line.
 
     [Arguments]  ${host}=${OPENBMC_HOST}  ${mask}=${NET_MASK}
diff --git a/lib/connection_client.robot b/lib/connection_client.robot
index 6efb1b4..543879d 100755
--- a/lib/connection_client.robot
+++ b/lib/connection_client.robot
@@ -21,7 +21,7 @@
     #                   keyword. This includes, but is not limited to, the
     #                   following:
     #                   host, alias, port, timeout, newline, prompt, term_type,
-    #                   width, height, path_separator, endcoding
+    #                   width, height, path_separator, encoding
     #                   (For more information, please visit the SSHLibrary doc)
 
     #                   Of the above arguments to Open Connection, this keyword
diff --git a/lib/redfish_code_update_utils.robot b/lib/redfish_code_update_utils.robot
index c182897..7f82c1f 100644
--- a/lib/redfish_code_update_utils.robot
+++ b/lib/redfish_code_update_utils.robot
@@ -127,11 +127,11 @@
 
 
 Get Non Functional Firmware
-    [Documentation]  Get BMC non functional fimware details.
+    [Documentation]  Get BMC non functional firmware details.
     [Arguments]  ${sw_inv}  ${functional_state}
 
     # Description of argument(s):
-    # sw_inv            This dictionay contains all the BMC fimware details.
+    # sw_inv            This dictionary contains all the BMC firmware details.
     # functional_state  Functional state can be either True or False.
 
     ${resp}=  Filter Struct  ${sw_inv}  [('functional', ${functional_state})]
diff --git a/lib/utils.robot b/lib/utils.robot
index 63464a3..61497fc 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -69,7 +69,7 @@
     # max_timeout   Maximum time to wait.
     #               This should be expressed in Robot Framework's time format
     #               (e.g. "10 minutes").
-    # interfal      Interval to wait between status checks.
+    # interval      Interval to wait between status checks.
     #               This should be expressed in Robot Framework's time format
     #               (e.g. "5 seconds").
 
diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index cfe0e6b..6db1281 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -304,7 +304,7 @@
 
 
 RW General Dictionary
-    [Documentation]  Create dictionay of lock request.
+    [Documentation]  Create dictionary of lock request.
     [Arguments]  ${read_case}  ${res_id}
 
     # Description of argument(s):
@@ -459,7 +459,7 @@
 
 
 Form Data To Acquire Lock
-    [Documentation]  Create a dictionay for lock request.
+    [Documentation]  Create a dictionary for lock request.
     [Arguments]  ${lock_type}
 
     # Description of argument(s):
@@ -476,7 +476,7 @@
 
 
 Create Data To Acquire List Of Lock
-    [Documentation]  Create a dictionay for list of lock request.
+    [Documentation]  Create a dictionary for list of lock request.
     [Arguments]  ${lock_type_list}
 
     # Description of argument(s):
@@ -498,7 +498,7 @@
 
 
 Form Data To Acquire Invalid Lock With Invalid Data Type Of Resource ID
-    [Documentation]  Create a dictionay for in-valid lock request.
+    [Documentation]  Create a dictionary for in-valid lock request.
     [Arguments]  ${lock_type}
 
     # Description of argument(s):
@@ -515,7 +515,7 @@
 
 
 Form Data To Acquire Invalid Lock
-    [Documentation]  Create a dictionay for in-valid lock request.
+    [Documentation]  Create a dictionary for in-valid lock request.
     [Arguments]  ${lock_type}
 
     # Description of argument(s):
@@ -833,7 +833,7 @@
 
 
 Verify Fail To Release Lock With Invalid TransactionID
-    [Documentation]  Verify fail to be release lock with invalid trasaction ID.
+    [Documentation]  Verify fail to be release lock with invalid transaction ID.
     [Arguments]  ${client_id}  ${lock_type}  ${release_lock_type}
 
     # Description of argument(s):
@@ -956,7 +956,7 @@
 
 
 Verify Fail To Acquire Lock For Invalid Lock Data
-    [Documentation]  Verify fail to acquired lock with invalid lock types, lock flags, segement flags.
+    [Documentation]  Verify fail to acquired lock with invalid lock types, lock flags, segment flags.
     [Arguments]  ${client_id}  ${lock_type}  ${message}
 
     # Description of argument(s):
diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 935bdd0..13cf0cc 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -190,7 +190,7 @@
 
 
 Non Admin User Delete Non Existence Of Partition File
-    [Documentation]  Delete the partion file if does not exists.
+    [Documentation]  Delete the partition file if does not exists.
     [Tags]  Non_Admin_User_Delete_Non_Existence_Of_Partition_File
     [Template]  Non Admin Delete Non Existence Partition File
 
@@ -380,7 +380,7 @@
 
 
 Redfish Fail To Upload Partition File
-    [Documentation]  Fail to uplaod the partition file.
+    [Documentation]  Fail to upload the partition file.
     [Arguments]  ${file_name}
 
     # Description of argument(s):
@@ -633,7 +633,7 @@
 
 
 Non Admin User To Upload Partition File
-    [Documentation]  Non admin user to uplaod the partition file.
+    [Documentation]  Non admin user to upload the partition file.
     [Arguments]  ${file_name}  ${username}  ${password}  ${role}  ${enabled}=${True}
 
     # Description of argument(s):
@@ -654,7 +654,7 @@
 
 
 Non Admin Delete Non Existence Partition File
-    [Documentation]  Non admin user to uplaod the partition file.
+    [Documentation]  Non admin user to upload the partition file.
     [Arguments]  ${file_name}  ${username}  ${password}  ${role}  ${enabled}=${True}
 
     # Description of argument(s):
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index 6a96ab4..f26f310 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -92,9 +92,9 @@
     a.3.118.94    0.0.0.0     255.255.252.0    ${HTTP_BAD_REQUEST}
 
 
-Add Multiple IP Addreses On VMI Interface And Verify
-    [Documentation]  Add multiple IP addreses on VMI interface and verify.
-    [Tags]  Add_Multiple_IP_Addreses_On_VMI_Interface_And_Verify
+Add Multiple IP Addresses On VMI Interface And Verify
+    [Documentation]  Add multiple IP addresses on VMI interface and verify.
+    [Tags]  Add_Multiple_IP_Addresses_On_VMI_Interface_And_Verify
     [Teardown]   Run keywords  Delete VMI IPv4 Address  AND  Test Teardown Execution
 
     ${ip1}=  Create dictionary  Address=10.5.5.10  SubnetMask=255.255.252.0  Gateway=0.0.0.0
diff --git a/openpower/vpd/test_vpd_tool.robot b/openpower/vpd/test_vpd_tool.robot
index a317c39..2608658 100644
--- a/openpower/vpd/test_vpd_tool.robot
+++ b/openpower/vpd/test_vpd_tool.robot
@@ -94,7 +94,7 @@
 
 
 Verify VPD Component Read Operation
-    [Documentation]  Verify reading VPD details of given compoment via vpdtool.
+    [Documentation]  Verify reading VPD details of given component via vpdtool.
     [Arguments]  ${component}
     # Description of arguments:
     # component       VDP component (e.g. /system/chassis/motherboard/vdd_vrm1).
@@ -115,7 +115,7 @@
 
 
 Verify VPD Field Read Operation
-    [Documentation]  Verify reading all VPD fields for given compoment via vpdtool.
+    [Documentation]  Verify reading all VPD fields for given component via vpdtool.
     [Arguments]  ${component}
     # Description of arguments:
     # component       VDP component (e.g. /system/chassis/motherboard/vdd_vrm1).
diff --git a/redfish/dmtf_tools/test_redfishtool_certificate.robot b/redfish/dmtf_tools/test_redfishtool_certificate.robot
index 570a1b6..0969369 100644
--- a/redfish/dmtf_tools/test_redfishtool_certificate.robot
+++ b/redfish/dmtf_tools/test_redfishtool_certificate.robot
@@ -108,9 +108,9 @@
     CA           Empty Certificate  error
 
 
-Verify Error While Uploding Same CA Certificate Via Redfishtool
+Verify Error While Uploading Same CA Certificate Via Redfishtool
     [Documentation]  Verify error while uploading same CA certificate two times.
-    [Tags]  Verify_Error_While_Uploding_Same_CA_Certificate_Via_Redfishtool
+    [Tags]  Verify_Error_While_Uploading_Same_CA_Certificate_Via_Redfishtool
 
     # Create certificate file for uploading.
     ${cert_file_path}=  Generate Certificate File Via Openssl  Valid Certificate  365
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 191232e..7c1ade5 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -144,7 +144,7 @@
 
 
 Activate Existing Firmware
-    [Documentation]  Set fimware image to lower priority.
+    [Documentation]  Set firmware image to lower priority.
     [Arguments]  ${image_version}
 
     # Description of argument(s):
@@ -176,7 +176,7 @@
     [Arguments]  ${image_version}
 
     # Description of argument(s):
-    # image_version       The Fimware image version (e.g. 2.8.0-dev-1107-g512028d95).
+    # image_version       The Firmware image version (e.g. 2.8.0-dev-1107-g512028d95).
 
     ${software_info}=  Read Properties
     ...  ${SOFTWARE_VERSION_URI}/enumerate  quiet=1
@@ -195,7 +195,7 @@
     [Arguments]  ${image_version}  ${software_inventory}
 
     # Description of argument(s):
-    # image_version       The Fimware image version (e.g. 2.8.0-dev-1107-g512028d95).
+    # image_version       The Firmware image version (e.g. 2.8.0-dev-1107-g512028d95).
     # software_inventory  Software inventory details.
 
     ${least_priority}=  Get Least Value Priority Image  ${VERSION_PURPOSE_BMC}
diff --git a/redfish/extended/test_bmc_dump.robot b/redfish/extended/test_bmc_dump.robot
index d1094cc..d5bc4a1 100644
--- a/redfish/extended/test_bmc_dump.robot
+++ b/redfish/extended/test_bmc_dump.robot
@@ -204,7 +204,7 @@
     #Get dump details
     @{dump_entry_list}=  Read Properties  ${DUMP_ENTRY_URI}
 
-    # Verifing that there is only one dump
+    # Verifying that there is only one dump
     ${length}=  Get length  ${dump_entry_list}
     Should Be Equal As Integers  ${length}  ${1}
 
diff --git a/redfish/managers/test_bmc_network_conf.robot b/redfish/managers/test_bmc_network_conf.robot
index 3953ec1..5913bd0 100644
--- a/redfish/managers/test_bmc_network_conf.robot
+++ b/redfish/managers/test_bmc_network_conf.robot
@@ -25,7 +25,7 @@
 ${out_of_range_ip}         10.7.7.256
 ${test_ipv4_addr2}         10.7.7.8
 
-# Valid netmask is 4 bytes long and has continuos block of 1s.
+# Valid netmask is 4 bytes long and has continuous block of 1s.
 # Maximum valid value in each octet is 255 and least value is 0.
 # 253 is not valid, as binary value is 11111101.
 ${invalid_netmask}         255.255.253.0
diff --git a/redfish/managers/test_certificate.robot b/redfish/managers/test_certificate.robot
index 5adceaa..353f0fd 100644
--- a/redfish/managers/test_certificate.robot
+++ b/redfish/managers/test_certificate.robot
@@ -97,9 +97,9 @@
     Install And Verify Certificate Via Redfish  CA  Valid Certificate  error  ${FALSE}
 
 
-Verify Error While Uploding Same CA Certificate
+Verify Error While Uploading Same CA Certificate
     [Documentation]  Verify error while uploading same CA certificate two times.
-    [Tags]  Verify_Error_While_Uploding_Same_CA_Certificate
+    [Tags]  Verify_Error_While_Uploading_Same_CA_Certificate
 
     # Create certificate file for uploading.
     ${cert_file_path}=  Generate Certificate File Via Openssl  Valid Certificate  365
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index bebf57e..f0f9aaa 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -32,7 +32,7 @@
 *** Test Cases ***
 
 Redfish Code Update With ApplyTime OnReset
-    [Documentation]  Update the firmaware image with ApplyTime of OnReset.
+    [Documentation]  Update the firmware image with ApplyTime of OnReset.
     [Tags]  Redfish_Code_Update_With_ApplyTime_OnReset
     [Template]  Redfish Update Firmware
 
@@ -41,7 +41,7 @@
 
 
 Redfish Code Update With ApplyTime Immediate
-    [Documentation]  Update the firmaware image with ApplyTime of Immediate.
+    [Documentation]  Update the firmware image with ApplyTime of Immediate.
     [Tags]  Redfish_Code_Update_With_ApplyTime_Immediate
     [Template]  Redfish Update Firmware
 
@@ -50,7 +50,7 @@
 
 
 Redfish Code Update With Multiple Firmware
-    [Documentation]  Update the firmaware image with ApplyTime of Immediate.
+    [Documentation]  Update the firmware image with ApplyTime of Immediate.
     [Tags]  Redfish_Code_Update_With_Multiple_Firmware
     [Template]  Redfish Multiple Upload Image And Check Progress State
 
diff --git a/redfish/update_service/test_redfish_host_code_update.robot b/redfish/update_service/test_redfish_host_code_update.robot
index fc7cc0a..dd6b919 100644
--- a/redfish/update_service/test_redfish_host_code_update.robot
+++ b/redfish/update_service/test_redfish_host_code_update.robot
@@ -32,7 +32,7 @@
 *** Test Cases ***
 
 Redfish Host Code Update With ApplyTime OnReset
-    [Documentation]  Update the firmaware image with ApplyTime of OnReset.
+    [Documentation]  Update the firmware image with ApplyTime of OnReset.
     [Tags]  Redfish_Host_Code_Update_With_ApplyTime_OnReset
     [Template]  Redfish Update Firmware
 
@@ -41,7 +41,7 @@
 
 
 Redfish Host Code Update With ApplyTime Immediate
-    [Documentation]  Update the firmaware image with ApplyTime of Immediate.
+    [Documentation]  Update the firmware image with ApplyTime of Immediate.
     [Tags]  Redfish_Host_Code_Update_With_ApplyTime_Immediate
     [Template]  Redfish Update Firmware
 
diff --git a/tests/test_hardware_sensors.robot b/tests/test_hardware_sensors.robot
index 21b4ff3..e1615a9 100644
--- a/tests/test_hardware_sensors.robot
+++ b/tests/test_hardware_sensors.robot
@@ -270,7 +270,7 @@
 
    # Example:
    # "/xyz/openbmc_project/sensors/voltage/voltage0",
-   # "/xyz/openbmc_project/sensors/volatge/voltage_1",
+   # "/xyz/openbmc_project/sensors/voltage/voltage_1",
    # "/xyz/openbmc_project/sensors/voltage/VOLTAGE_2",
    # "/xyz/openbmc_project/sensors/voltage/VOLTAGE1",
    # "/xyz/openbmc_project/sensors/voltage/voltage".