diff --git a/extended/code_update/code_update_utils.robot b/extended/code_update/code_update_utils.robot
index 6d12349..d517f78 100644
--- a/extended/code_update/code_update_utils.robot
+++ b/extended/code_update/code_update_utils.robot
@@ -53,7 +53,7 @@
 
 
 SCP Tar Image File to BMC
-    [arguments]         ${filepath}
+    [Arguments]         ${filepath}
     Open Connection for SCP
     scp.Put File      ${filepath}   /tmp/flashimg
 
@@ -101,7 +101,7 @@
 
 Set Policy Setting
     [Documentation]   Set the given test policy
-    [arguments]   ${policy}
+    [Arguments]   ${policy}
 
     ${valueDict}=     create dictionary  data=${policy}
     Write Attribute    ${HOST_SETTING}    power_policy   data=${valueDict}
diff --git a/extended/standby_bmc.robot b/extended/standby_bmc.robot
index 3e17fc0..7778b09 100644
--- a/extended/standby_bmc.robot
+++ b/extended/standby_bmc.robot
@@ -90,7 +90,7 @@
 
 Update Policy Setting
     [Documentation]   Update the given restore policy
-    [arguments]   ${policy}
+    [Arguments]   ${policy}
 
     ${valueDict}=     create dictionary  data=${policy}
     Write Attribute    ${HOST_SETTING}    power_policy   data=${valueDict}
diff --git a/extended/test_networkd_ext.robot b/extended/test_networkd_ext.robot
index 3064920..0118d72 100755
--- a/extended/test_networkd_ext.robot
+++ b/extended/test_networkd_ext.robot
@@ -143,7 +143,7 @@
     ...               {"data": [[[2,25,0,128,"9.3.164.177"],[2,8,254,128,"127.0.0.1"]],"9.3.164.129"],
     ...                "message": "200 OK", "status": "ok"}
 
-    [arguments]    ${intf}
+    [Arguments]    ${intf}
     @{arglist}=    Create List   ${intf}
     ${args}=       Create Dictionary   data=@{arglist}
     ${resp}=       Call Method
diff --git a/extended/test_power_restore.robot b/extended/test_power_restore.robot
index 3709dca..af53fc6 100644
--- a/extended/test_power_restore.robot
+++ b/extended/test_power_restore.robot
@@ -46,7 +46,7 @@
 ***keywords***
 
 Set Restore Policy
-    [arguments]    ${policy}   ${expectedState}   ${nextState}
+    [Arguments]    ${policy}   ${expectedState}   ${nextState}
 
     Set Policy Setting   ${policy}
 
@@ -72,7 +72,7 @@
 
 Set Policy Setting
     [Documentation]   Set the given test policy
-    [arguments]   ${policy}
+    [Arguments]   ${policy}
 
     ${valueDict}=     create dictionary  data=${policy}
     Write Attribute    ${HOST_SETTING}    power_policy   data=${valueDict}
@@ -83,7 +83,7 @@
 Set Initial Test State
     [Documentation]   Poweron if ON expected, Poweroff if OFF expected
     ...               to initial state of the test.
-    [arguments]   ${expectedState}
+    [Arguments]   ${expectedState}
 
     Run Keyword If
     ...   '${expectedState}' == 'HOST_BOOTED'
@@ -95,7 +95,7 @@
 
 
 System State
-    [arguments]     ${nextState}
+    [Arguments]     ${nextState}
     ${afterPduSystemState}=
     ...   Read Attribute    ${HOST_SETTING}    system_state
     Should be equal   ${afterPduSystemState}    ${nextState}
diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 4b3db07..dc44b7c 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -19,7 +19,7 @@
 *** Keywords ***
 
 Run IPMI Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${resp}=     Run Keyword If   '${IPMI_COMMAND}'=='External'
     ...    Run External IPMI RAW Command   ${args}
     ...          ELSE IF          '${IPMI_COMMAND}'=='Dbus'
@@ -29,7 +29,7 @@
     [return]    ${resp}
 
 Run IPMI Standard Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${resp}=     Run Keyword If   '${IPMI_COMMAND}'=='External'
     ...    Run External IPMI Standard Command   ${args}
     ...          ELSE IF          '${IPMI_COMMAND}'=='Dbus'
@@ -40,7 +40,7 @@
     [return]    ${resp}
 
 Run Dbus IPMI RAW Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${valueinBytes}=   Byte Conversion  ${args}
     ${cmd}=   Catenate   ${dbushostipmicmd1} ${dbusHostIpmiCmdReceivedMsg}
     ${cmd}=   Catenate   ${cmd} ${valueinBytes}
@@ -49,7 +49,7 @@
     set test variable    ${OUTPUT}     "${output}"
 
 Run Dbus IPMI Standard Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     Copy ipmitool
     ${stdout}    ${stderr}    ${output}=  Execute Command
     ...    /tmp/ipmitool -I dbus ${args}    return_stdout=True
@@ -58,7 +58,7 @@
     [return]    ${stdout}
 
 Run External IPMI RAW Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${ipmi_raw_cmd}=   Catenate  SEPARATOR=
     ...    ${IPMI_EXT_CMD}${SPACE}${IPMI_PASSWORD}${SPACE}
     ...    ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}${RAW}${SPACE}${args}
@@ -67,7 +67,7 @@
     [return]    ${output}
 
 Run External IPMI Standard Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${ipmi_cmd}=   Catenate  SEPARATOR=
     ...    ${IPMI_EXT_CMD}${SPACE}${IPMI_PASSWORD}${SPACE}
     ...    ${HOST}${SPACE}${OPENBMC_HOST}${SPACE}${args}
@@ -91,7 +91,7 @@
     ...               Sample dbus  Host IPMI Received Message argument
     ...               byte:0x00 byte:0x04 byte:0x00 byte:0x30
     ...               array:byte:9,0x01,0x00,0x35,0x00,0x00,0x00,0x00,0x00,0x00
-    [arguments]     ${args}
+    [Arguments]     ${args}
     ${argLength}=   Get Length  ${args}
     Set Global Variable  ${arrayByte}   array:byte:
     @{listargs}=   Split String  ${args}
@@ -122,17 +122,17 @@
 
 
 Set NetFn Byte
-   [arguments]    ${word}
+   [Arguments]    ${word}
    ${netfnByteLocal}=  Catenate   byte:${word}
    Set Global Variable  ${netfnByte}  ${netfnByteLocal}
 
 Set Cmd Byte
-   [arguments]    ${word}
+   [Arguments]    ${word}
    ${cmdByteLocal}=  Catenate   byte:${word}
    Set Global Variable  ${cmdByte}  ${cmdByteLocal}
 
 Set Array Byte
-   [arguments]    ${word}
+   [Arguments]    ${word}
    ${arrayByteLocal}=   Catenate   SEPARATOR=  ${arrayByte}  ${word}
    ${arrayByteLocal}=   Catenate   SEPARATOR=  ${arrayByteLocal}   ,
    Set Global Variable  ${arrayByte}   ${arrayByteLocal}
diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index 6bbe21a..6761762 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -130,7 +130,7 @@
     Log    ${msg}    console=True
 
 Read Attribute
-    [arguments]    ${uri}    ${attr}    ${timeout}=10  ${quiet}=${QUIET}
+    [Arguments]    ${uri}    ${attr}    ${timeout}=10  ${quiet}=${QUIET}
     ${resp}=  OpenBMC Get Request  ${uri}/attr/${attr}  timeout=${timeout}
     ...  quiet=${quiet}
     ${content}=     To Json    ${resp.content}
@@ -145,14 +145,14 @@
     ${json}=   to json         ${resp.content}
 
 Read Properties
-    [arguments]    ${uri}    ${timeout}=10
+    [Arguments]    ${uri}    ${timeout}=10
     ${resp}=   OpenBMC Get Request    ${uri}    timeout=${timeout}
     Should Be Equal As Strings    ${resp.status_code}    ${HTTP_OK}
     ${content}=     To Json    ${resp.content}
     [return]    ${content["data"]}
 
 Call Method
-    [arguments]  ${uri}  ${method}  ${timeout}=10  ${quiet}=${QUIET}  &{kwargs}
+    [Arguments]  ${uri}  ${method}  ${timeout}=10  ${quiet}=${QUIET}  &{kwargs}
 
     ${base_uri}=    Catenate    SEPARATOR=    ${DBUS_PREFIX}    ${uri}
     ${resp}=  OpenBmc Post Request  ${base_uri}/action/${method}
diff --git a/lib/utils.robot b/lib/utils.robot
index 9c42892..385183e 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -219,7 +219,7 @@
 
 Flash PNOR
     [Documentation]    Calls flash bios update method to flash PNOR image
-    [arguments]    ${pnor_image}
+    [Arguments]    ${pnor_image}
     @{arglist}=   Create List    ${pnor_image}
     ${args}=     Create Dictionary    data=@{arglist}
     ${resp}=  Call Method  ${OPENBMC_BASE_URI}control/flash/bios/  update
@@ -270,7 +270,7 @@
     [Documentation]  Wait for Host to be online. Checks every X seconds
     ...              interval for Y minutes and fails if timed out.
     ...              Default MAX timedout is 10 min, interval 10 seconds.
-    [arguments]      ${max_timeout}=${OPENBMC_REBOOT_TIMEOUT} min
+    [Arguments]      ${max_timeout}=${OPENBMC_REBOOT_TIMEOUT} min
     ...              ${interval}=10 sec
 
     Wait Until Keyword Succeeds
@@ -292,7 +292,7 @@
 
 Initialize DBUS cmd
     [Documentation]  Initialize dbus string with property string to extract
-    [arguments]   ${boot_property}
+    [Arguments]   ${boot_property}
     ${cmd}=     Catenate  ${dbuscmdBase} ${dbuscmdGet} ${dbuscmdString}
     ${cmd}=     Catenate  ${cmd}${boot_property}
     Set Global Variable   ${dbuscmd}     ${cmd}
diff --git a/tests/test_association.robot b/tests/test_association.robot
index 4ba24d5..ea0fc6c 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -255,7 +255,7 @@
     [return]    ${jsondata['data']}
 
 Create a test log
-    [arguments]
+    [Arguments]
     ${data}=   create dictionary   data=@{EMPTY}
     ${resp}=   openbmc post request
     ...     ${EVENT_RECORD}action/acceptTestMessage    data=${data}
diff --git a/tests/test_boot.robot b/tests/test_boot.robot
index ca8aad9..95f1696 100644
--- a/tests/test_boot.robot
+++ b/tests/test_boot.robot
@@ -171,11 +171,11 @@
 *** Keywords ***
 
 Response Should Be Equal
-    [arguments]    ${args}
+    [Arguments]    ${args}
     Should Be Equal    ${OUTPUT}    ${args}
 
 Read the Attribute
-    [arguments]    ${uri}    ${parm}
+    [Arguments]    ${uri}    ${parm}
     ${output}=     Read Attribute      ${uri}    ${parm}
     set test variable    ${OUTPUT}     ${output}
 
diff --git a/tests/test_esel.robot b/tests/test_esel.robot
index 59156b4..16d284a 100644
--- a/tests/test_esel.robot
+++ b/tests/test_esel.robot
@@ -48,17 +48,17 @@
 *** Keywords ***
 
 Run IPMI Command Returned
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${output_1}=    Execute Command    /tmp/ipmitool -I dbus raw ${args}
     [return]    ${output_1}
 
 Check IPMI Oempartialadd Reject
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${stdout}    ${stderr}    ${output_2}=  Execute Command    /tmp/ipmitool -I dbus raw ${args}    return_stdout=True    return_stderr= True    return_rc=True
     [return]    ${stderr}
 
 Check IPMI Oempartialadd Accept
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${stdout}    ${stderr}    ${output_3}=    Execute Command    /tmp/ipmitool -I dbus raw ${args}    return_stdout=True    return_stderr= True    return_rc=True
     Should Be Equal    ${output_3}    ${0}    msg=${stderr}
     [return]    ${stderr}
diff --git a/tests/test_eventlog.robot b/tests/test_eventlog.robot
index 1e79897..7ec4d1b 100644
--- a/tests/test_eventlog.robot
+++ b/tests/test_eventlog.robot
@@ -201,7 +201,7 @@
 *** Keywords ***
 
 create a test log
-    [arguments]
+    [Arguments]
     ${data}=   create dictionary   data=@{EMPTY}
     ${resp}=   openbmc post request   ${EVENT_RECORD}action/acceptTestMessage    data=${data}
     should be equal as strings      ${resp.status_code}     ${HTTP_OK}
diff --git a/tests/test_inventory.robot b/tests/test_inventory.robot
index 6b97219..a733678 100644
--- a/tests/test_inventory.robot
+++ b/tests/test_inventory.robot
@@ -86,7 +86,7 @@
     log Dictionary      ${resp}
 
 Get Total Present
-    [arguments]     ${type}
+    [Arguments]     ${type}
     ${l}=          Create List     []
     ${resp}=    Get Dictionary Keys    ${SYSTEM_INFO}
     ${list}=    Get Matches    ${resp}    regexp=^.*[0-9a-z_].${type}[0-9]*$
@@ -97,7 +97,7 @@
     [return]        ${sum}
 
 Verify Properties
-    [arguments]     ${type}
+    [Arguments]     ${type}
 
     ${list}=     Get VPD Inventory List     ${OPENBMC_MODEL}     ${type}
     : FOR     ${element}     IN      @{list}
@@ -105,7 +105,7 @@
     \     Run Keyword If     ${d['present']} == True        Verify Present Properties     ${d}     ${type}
 
 Verify Present Properties
-    [arguments]     ${d}     ${type}
+    [Arguments]     ${d}     ${type}
     ${keys}=     Get Dictionary Keys     ${d}
     Log List     ${keys}
     Log List     ${INVENTORY_ITEMS['${type}']}
diff --git a/tests/test_led.robot b/tests/test_led.robot
index 1c2f442..51e3eb5 100644
--- a/tests/test_led.robot
+++ b/tests/test_led.robot
@@ -198,7 +198,7 @@
    should be true   ${ON_VALUE} > ${MIN_TOGGLE_VALUE} and ${OFF_VALUE} > ${MIN_TOGGLE_VALUE}
 
 Get LED State
-   [arguments]    ${args}
+   [Arguments]    ${args}
    ${data}=   create dictionary   data=@{EMPTY}
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/GetLedState   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
@@ -206,7 +206,7 @@
    [return]    ${json['data'][1]}
 
 Set On
-   [arguments]    ${args}
+   [Arguments]    ${args}
    ${data}=   create dictionary   data=@{EMPTY}
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/setOn   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
@@ -214,7 +214,7 @@
    should be equal as integers   ${json['data']}   0
 
 Set Off
-   [arguments]    ${args}
+   [Arguments]    ${args}
    ${data}=   create dictionary   data=@{EMPTY}
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/setOff   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
@@ -222,7 +222,7 @@
    should be equal as integers   ${json['data']}   0
 
 Set Blink Fast
-   [arguments]    ${args}
+   [Arguments]    ${args}
    ${data}=   create dictionary   data=@{EMPTY}
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/setBlinkFast   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
@@ -230,7 +230,7 @@
    should be equal as integers   ${json['data']}   0
 
 Set Blink Slow
-   [arguments]    ${args}
+   [Arguments]    ${args}
    ${data}=   create dictionary   data=@{EMPTY}
    ${resp}=   OpenBMC Post Request   ${LED_CONTROL}${args}/action/setBlinkSlow   data=${data}
    should be equal as strings   ${resp.status_code}   ${HTTP_OK}
diff --git a/tests/test_networkd.robot b/tests/test_networkd.robot
index 0e661ac..8da2f86 100755
--- a/tests/test_networkd.robot
+++ b/tests/test_networkd.robot
@@ -143,7 +143,7 @@
     ...               {"data": [[[2,25,0,128,"9.3.164.177"],[2,8,254,128,"127.0.0.1"]],"9.3.164.129"],
     ...                "message": "200 OK", "status": "ok"}
 
-    [arguments]    ${intf}
+    [Arguments]    ${intf}
     @{arglist}=    Create List   ${intf}
     ${args}=       Create Dictionary   data=@{arglist}
     ${resp}=       Call Method   ${NW_MANAGER}  GetAddress4    data=${args}
diff --git a/tests/test_openbmc_service_restart_policy.robot b/tests/test_openbmc_service_restart_policy.robot
index faa10ff..d52a51f 100644
--- a/tests/test_openbmc_service_restart_policy.robot
+++ b/tests/test_openbmc_service_restart_policy.robot
@@ -83,7 +83,7 @@
 *** Keywords ***
 
 Check Service Autorestart
-    [arguments]    ${servicename}
+    [Arguments]    ${servicename}
     ${restart_policy}=
     ...  Execute Restart Policy Command
     ...  systemctl -p Restart show ${servicename} | cut -d = -f2
@@ -92,7 +92,7 @@
 
 
 Execute Restart Policy Command
-    [arguments]    ${command}
+    [Arguments]    ${command}
     ${stdout}   ${stderr}=   Execute Command   ${command}   return_stderr=True
     Should Be Empty    ${stderr}
     [Return]    ${stdout}
diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index c46e885..72c5d71 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -295,28 +295,28 @@
     [return]    ${url}
 
 Execute new Command
-    [arguments]    ${args}
+    [Arguments]    ${args}
     ${output}=  Execute Command    ${args}
     set test variable    ${OUTPUT}     "${output}"
 
 response Should Be Equal
-    [arguments]    ${args}
+    [Arguments]    ${args}
     Should Be Equal    ${OUTPUT}    ${args}
 
 Response Should Be Empty
     Should Be Empty    ${OUTPUT}
 
 Read the Attribute
-    [arguments]    ${uri}    ${parm}
+    [Arguments]    ${uri}    ${parm}
     ${output}=     Read Attribute      ${uri}    ${parm}
     set test variable    ${OUTPUT}     ${output}
 
 Get Sensor Number
-    [arguments]  ${name}
+    [Arguments]  ${name}
     ${x}=       get sensor   ${OPENBMC_MODEL}   ${name}
     [return]     ${x}
 
 Get Inventory Sensor Number
-    [arguments]  ${name}
+    [Arguments]  ${name}
     ${x}=       get inventory sensor   ${OPENBMC_MODEL}   ${name}
     [return]     ${x}