diff --git a/lib/bios_attr_utils.robot b/lib/bios_attr_utils.robot
index 3520a1f..b485da4 100644
--- a/lib/bios_attr_utils.robot
+++ b/lib/bios_attr_utils.robot
@@ -30,7 +30,7 @@
     IF  ${type_str}
         # Handling the case when the BIOS attribute value is an empty string.
         ${attr_value_length}=  Evaluate  len($attr_val.replace('"', ''))
-        IF  ${attr_value_length} 
+        IF  ${attr_value_length}
             ${value}=  Set Variable  "${attr_val}"
         ELSE
             ${value}=  Set Variable  ${attr_val}
diff --git a/lib/bmc_network_utils.robot b/lib/bmc_network_utils.robot
index 772b892..76a31ca 100644
--- a/lib/bmc_network_utils.robot
+++ b/lib/bmc_network_utils.robot
@@ -835,7 +835,7 @@
 
     # Description of argument(s):
     # channel_number   Ethernet channel number, 1 is for eth0 and 2 is for eth1 (e.g. "1").
- 
+
     ${active_channel_config}=  Get Active Channel Config
     ${ethernet_interface}=  Set Variable  ${active_channel_config['${CHANNEL_NUMBER}']['name']}
     ${resp}=  Redfish.Get Attribute  ${REDFISH_NW_ETH_IFACE}${ethernet_interface}  DHCPv4
diff --git a/redfish/systems/test_boot_devices.robot b/redfish/systems/test_boot_devices.robot
index d046bef..e567027 100644
--- a/redfish/systems/test_boot_devices.robot
+++ b/redfish/systems/test_boot_devices.robot
@@ -102,7 +102,7 @@
     Disabled                      None                        Legacy
 
 
-Verify Boot Source Override Policy Persistency with Enabled Mode As Once After BMC Reboot
+Verify Boot Source Override Policy Persistency With Enabled Mode As Once After BMC Reboot
     [Documentation]  Verify Boot Source Override Policy Persistency with Enabled Mode As Once After BMC Reboot.
     [Tags]           Verify_Boot_Source_Override_Policy_Persistency_With_Enabled_Mode_As_Once_After_BMC_Reboot
     [Template]  Verify Boot Source Override After BMC Reboot
@@ -122,7 +122,7 @@
     Once                          None                        Legacy
 
 
-Verify Boot Source Override Policy Persistency with Enabled Mode As Continuous After BMC Reboot
+Verify Boot Source Override Policy Persistency With Enabled Mode As Continuous After BMC Reboot
     [Documentation]  Verify Boot Source Override Policy Persistency with Enabled Mode As Continuous After BMC Reboot.
     [Tags]           Verify_Boot_Source_Override_Policy_Persistency_With_Enabled_Mode_As_Continuous_After_BMC_Reboot
     [Template]  Verify Boot Source Override After BMC Reboot
@@ -142,7 +142,7 @@
     Continuous                    None                        Legacy
 
 
-Verify Boot Source Override Policy with Enabled Mode As Once After Host Reboot
+Verify Boot Source Override Policy With Enabled Mode As Once After Host Reboot
     [Documentation]  Verify Boot Source Override Policy with Enabled Mode As Once After Host Reboot.
     [Tags]           Verify_Boot_Source_Override_Policy_With_Enabled_Mode_As_Once_After_Host_Reboot
     [Template]  Verify Boot Source Override with Enabled Mode As Once After Host Reboot
@@ -160,7 +160,7 @@
     None                        Legacy
 
 
-Verify Boot Source Override Policy with Enabled Mode As Continuous After Host Reboot
+Verify Boot Source Override Policy With Enabled Mode As Continuous After Host Reboot
     [Documentation]  Verify Boot Source Override Policy With Enabled Mode As Continuous After Host Reboot.
     [Tags]           Verify_Boot_Source_Override_Policy_With_Enabled_Mode_As_Continuous_After_Host_Reboot
     [Template]  Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot
@@ -178,7 +178,7 @@
     None                        Legacy
 
 
-Verify Boot Source Override with Enabled Mode As Once After Host Reboot For Bios Setup
+Verify Boot Source Override With Enabled Mode As Once After Host Reboot For Bios Setup
     [Documentation]  Verify Boot Source Override with Enabled Mode As Once After Host Reboot For Bios Setup.
     [Tags]           Verify_Boot_Source_Override_With_Enabled_Mode_As_Once_After_Host_Reboot_For_Bios_Setup
     [Template]  Verify Boot Source Override with Enabled Mode As Once After Host Reboot
@@ -188,7 +188,7 @@
     BiosSetup                   Legacy                   True
 
 
-Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot For Bios Setup
+Verify Boot Source Override With Enabled Mode As Continuous After Host Reboot For Bios Setup
     [Documentation]  Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot For Bios Setup.
     [Tags]           Verify_Boot_Source_Override_With_Enabled_Mode_As_Continuous_After_Host_Reboot_For_Bios_Setup
     [Template]  Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot
diff --git a/redfish/telemetry_service/test_telemetry_report.robot b/redfish/telemetry_service/test_telemetry_report.robot
index ba009a9..5a1d2e4 100644
--- a/redfish/telemetry_service/test_telemetry_report.robot
+++ b/redfish/telemetry_service/test_telemetry_report.robot
@@ -93,7 +93,7 @@
         ${metricProperties}=  Set Variable  ""
     ELSE
         ${metricProperties}=  Set Variable  ${resp["MetricProperties"]}
-    END 
+    END
     # Example of response from above Redfish GET request.
     # "@odata.id": "/redfish/v1/TelemetryService/MetricDefinitions/Ambient_0_Temp",
     # "@odata.type": "#MetricDefinition.v1_0_3.MetricDefinition",
diff --git a/redfish/update_service/test_redfish_bmc_code_update.robot b/redfish/update_service/test_redfish_bmc_code_update.robot
index 70c9261..9a3f114 100644
--- a/redfish/update_service/test_redfish_bmc_code_update.robot
+++ b/redfish/update_service/test_redfish_bmc_code_update.robot
@@ -330,7 +330,7 @@
     [Arguments]  ${operation}  ${count}
 
     # Description of argument(s):
-    # operation    Supports differnt variables.
+    # operation    Supports different variables.
     #              If host_name then change hostname,
     #              If kernel_panic then perform kernel panic,
     #              If https_certificate then change the https certificate.