CSIT-662: KWI - KW renaming

 - plus: CSIT-656: Script to rename robot keywords.

Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21
Signed-off-by: Tibor Frank <tifrank@cisco.com>

13 files changed, 125 insertions, 124 deletions

diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot
index e35cc92952..1d42cf186a 100644
--- a/resources/libraries/robot/honeycomb/access_control_lists.robot
+++ b/resources/libraries/robot/honeycomb/access_control_lists.robot
@@ -254,7 +254,7 @@
 | | ... | Get classify session data
 | | ... | ${node} | ${table_index} | ${session_index}
 
-| Interface ACL settings from Honeycomb should be
+| Interface ACL configuration from Honeycomb should be
 | | [Documentation] | Retrieves ACL interface settings from Honeycomb\
 | | ... | and compares with expected settings.
 | | ...
@@ -265,7 +265,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be \
+| | ... | \| Interface ACL configuration from Honeycomb should be \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| table0 \|
 | | [Arguments] | ${node} | ${interface} | ${table_name}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
@@ -274,7 +274,7 @@
 | | ... | ${data['vpp-interface-acl:acl']['ingress']['l2-acl']['classify-table']}
 | | ... | ${data['vpp-interface-acl:acl']['ingress']['ip4-acl']['classify-table']}
 
-| Interface ACL settings from VAT should be
+| Interface ACL configuration from VAT should be
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 | | ... | and compares with expected settings.
 | | ...
@@ -285,14 +285,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from VAT should be \| ${nodes['DUT1']} \
-| | ... | \| GigabithEthernet0/8/0 \| ${0} \|
+| | ... | \| Interface ACL configuration from VAT should be \
+| | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| ${0} \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${table_index}
 | | ${data}= | Get interface classify table | ${node} | ${interface}
 | | Should be equal | ${table_index} | ${data['l2_table_id']}
 | | Should be equal | ${table_index} | ${data['ip4_table_id']}
 
-| Interface ACL settings from Honeycomb should be empty
+| Interface ACL configuration from Honeycomb should be empty
 | | [Documentation] | Retrieves ACL interface settings from Honeycomb\
 | | ... | and expects to fail.
 | | ...
@@ -302,7 +303,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be empty \
+| | ... | \| Interface ACL configuration from Honeycomb should be empty \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface}
@@ -310,7 +311,7 @@
 | | ... | Set Variable
 | | ... | ${data['vpp-interface-acl:acl']['l2-acl']['classify-table']}
 
-| Interface ACL settings from VAT should be empty
+| Interface ACL configuration from VAT should be empty
 | | [Documentation] | Retrieves ACL interface settings from VAT\
 | | ... | and expects to fail.
 | | ...
@@ -320,7 +321,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface ACL settings from Honeycomb should be empty \
+| | ... | \| Interface ACL configuration from Honeycomb should be empty \
 | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | Get interface classify table | ${node} | ${interface}
@@ -379,7 +380,7 @@
 | | Set ACL plugin interface
 | | ... | ${node} | ${interface} | ${acl_list_name} | ${direction} | ${macip}
 
-| Clear plugin-ACL settings
+| Clear plugin-ACL configuration
 | | [Documentation] | Removes ACl assignment from interface, then deletes\
 | | ... | IETF-ACL chain.
 | | ...
@@ -389,7 +390,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Clear plugin-ACL settings | ${nodes['DUT1']} \
+| | ... | \| Clear plugin-ACL configuration | ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Delete interface plugin ACLs | ${node} | ${interface}
@@ -409,7 +410,7 @@
 | | VPP log plugin acl settings | ${node}
 | | VPP log plugin acl interface assignment | ${node}
 
-| Send ICMP packet with type and code
+| Send ICMP packet with type and code and verify received packet
 | | [Documentation] | Sends an ICMP packet with specified code and type.
 | | ...
 | | ... | *Arguments:*
@@ -429,7 +430,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send ICMP packet with type and code \| ${nodes['TG']} \
+| | ... | \| Send ICMP packet with type and code and verify received packet \| ${nodes['TG']} \
 | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \
 | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| ${1} \| ${1} \|
 | | ...
diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index e868ecd50a..d14dd2d722 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -17,7 +17,7 @@
 | Library | resources/libraries/python/honeycomb/HcPersistence.py
 
 *** Keywords ***
-| Setup Honeycomb service on DUTs
+| Configure Honeycomb service on DUTs
 | | [Documentation] | *Setup environment for honeycomb testing.*
 | | ...
 | | ... | _Setup steps:_
@@ -40,7 +40,7 @@
 | | Wait until keyword succeeds | 4min | 16sec
 | | ... | Check honeycomb startup state | @{duts}
 
-| Stop honeycomb service on DUTs
+| Stop Honeycomb service on DUTs
 | | [Documentation] | *Cleanup environment after honeycomb testing.*
 | | ...
 | | ... | _Teardown steps:_
@@ -89,7 +89,7 @@
 | | Stop Honeycomb service on DUTs | ${node}
 | | Clear persisted Honeycomb configuration | ${node}
 | | Setup DUT | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
 | Restart Honeycomb and VPP
 | | [Documentation] | Restarts Honeycomb service and wait until it starts up.
diff --git a/resources/libraries/robot/honeycomb/interfaces.robot b/resources/libraries/robot/honeycomb/interfaces.robot
index 3eef9f1b2d..95c6ece277 100644
--- a/resources/libraries/robot/honeycomb/interfaces.robot
+++ b/resources/libraries/robot/honeycomb/interfaces.robot
@@ -20,7 +20,7 @@
 | Library | resources.libraries.python.TrafficScriptExecutor
 
 *** Keywords ***
-| Honeycomb sets interface state
+| Honeycomb configures interface state
 | | [Documentation] | Uses Honeycomb API to change the admin state\
 | | ... | of the specified interface.
 | | ...
@@ -31,7 +31,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface state \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb configures interface state \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| up \|
 | | [Arguments] | ${node} | ${interface} | ${state}
 | | interfaceAPI.Set interface state | ${node} | ${interface} | ${state}
@@ -76,7 +76,7 @@
 | | ... | ${vat_data['admin_up_down']} == 1 | up | down
 | | Should be equal | ${vat_state} | ${state}
 
-| Honeycomb sets interface ipv4 address
+| Honeycomb sets interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to change ipv4 address\
 | | ... | of the specified interface. Any existing addresses will be removed.
 | | ...
@@ -88,13 +88,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv4 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb sets interface IPv4 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 255.255.255.0 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${netmask}
 | | interfaceAPI.Add first ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${netmask}
 
-| Honeycomb sets interface ipv4 address with prefix
+| Honeycomb sets interface IPv4 address with prefix
 | | [Documentation] | Uses Honeycomb API to assign an ipv4 address to the\
 | | ... | specified interface. Any existing addresses will be removed.
 | | ...
@@ -106,13 +106,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv4 address with prefix \
+| | ... | \| Honeycomb sets interface IPv4 address with prefix \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | interfaceAPI.Add first ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb adds interface ipv4 address
+| Honeycomb adds interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\
 | | ... | specified interface, without removing existing addresses.
 | | ...
@@ -124,13 +124,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv4 address \
+| | ... | \| Honeycomb adds interface IPv4 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | interfaceAPI.Add ipv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb fails to add interface ipv4 address
+| Honeycomb fails to add interface IPv4 address
 | | [Documentation] | Uses Honeycomb API to add an ipv4 address to the\
 | | ... | specified interface, and expects to fail with code 500.
 | | ...
@@ -142,11 +142,11 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb fails to add interface ipv4 address \
+| | ... | \| Honeycomb fails to add interface IPv4 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 192.168.0.2 \| 24 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | Run Keyword and Expect Error | *not successful. Status code: 500.
-| | ... | Honeycomb adds interface ipv4 address
+| | ... | Honeycomb adds interface IPv4 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
 | IPv4 address from Honeycomb should be
@@ -191,7 +191,7 @@
 | | ... | ip=${address} | netmask=${netmask} | prefix_length=${prefix}
 | | Should contain | ${vpp_data} | ${settings}
 
-| Honeycomb removes interface ipv4 addresses
+| Honeycomb removes interface IPv4 addresses
 | | [Documentation] | Removes all configured ipv4 addresses from the specified\
 | | ... | interface.
 | | ...
@@ -201,7 +201,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb removes interface ipv4 addresses \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb removes interface IPv4 addresses \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Remove all ipv4 addresses | ${node} | ${interface}
@@ -240,7 +240,7 @@
 | | ... | InterfaceCLI.VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv4
 
-| Honeycomb adds interface ipv4 neighbor
+| Honeycomb adds interface IPv4 neighbor
 | | [Documentation] | Uses Honeycomb API to assign an ipv4 neighbor to the\
 | | ... | specified interface.
 | | ...
@@ -252,7 +252,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv4 neighbor \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv4 neighbor \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \
 | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac}
 | | interfaceAPI.Add ipv4 neighbor
@@ -278,7 +278,7 @@
 | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static
 | | Should contain | ${api_data['ietf-ip:ipv4']['neighbor']} | ${settings}
 
-| Honeycomb clears all interface ipv4 neighbors
+| Honeycomb clears all interface IPv4 neighbors
 | | [Documentation] | Uses Honeycomb API to remove all ipv4 neighbors from the\
 | | ... | specified interface.
 | | ...
@@ -288,7 +288,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb clears all interface ipv4 neighbors \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb clears all interface IPv4 neighbors \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | interfaceAPI.Remove all ipv4 neighbors | ${node} | ${interface}
@@ -310,7 +310,7 @@
 | | Run keyword and expect error | *KeyError:*
 | | ... | Set Variable | ${api_data['ietf-ip:ipv4']['neighbor'][0]['ip']}
 
-| Honeycomb sets interface ipv6 address
+| Honeycomb sets interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to change ipv6 address\
 | | ... | of the specified interface. Existing IPv6 addresses will be removed,\
 | | ... | with the exception of self-configured link-layer IPv6.
@@ -323,13 +323,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface ipv6 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb sets interface IPv6 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | interfaceAPI.Add first ipv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb adds interface ipv6 address
+| Honeycomb adds interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to add an ipv6 address\
 | | ... | to the specified interface.
 | | ...
@@ -341,13 +341,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv6 address \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv6 address \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | interfaceAPI.Add ipv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
-| Honeycomb fails to add interface ipv6 address
+| Honeycomb fails to add interface IPv6 address
 | | [Documentation] | Uses Honeycomb API to add an ipv6 address to the\
 | | ... | specified interface, and expects to fail with code 500.
 | | ...
@@ -359,11 +359,11 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb fails to add interface ipv6 address \
+| | ... | \| Honeycomb fails to add interface IPv6 address \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| 10::10 \| 64 \|
 | | [Arguments] | ${node} | ${interface} | ${address} | ${prefix}
 | | Run Keyword and Expect Error | *not successful. Status code: 500.
-| | ... | Honeycomb adds interface ipv6 address
+| | ... | Honeycomb adds interface IPv6 address
 | | ... | ${node} | ${interface} | ${address} | ${prefix}
 
 | IPv6 address from Honeycomb should contain
@@ -407,7 +407,7 @@
 | | ... | ip=${address} | prefix_length=${prefix}
 | | Should contain | ${vpp_data} | ${settings}
 
-| Honeycomb removes interface ipv6 addresses
+| Honeycomb removes interface IPv6 addresses
 | | [Documentation] | Removes all configured ipv6 addresses from the specified\
 | | ... | interface.
 | | ...
@@ -417,7 +417,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb removes interface ipv6 addresses \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb removes interface IPv6 addresses \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | Remove all ipv6 addresses | ${node} | ${interface}
@@ -456,7 +456,7 @@
 | | ... | InterfaceCLI.VPP get interface ip addresses
 | | ... | ${node} | ${interface} | ipv6
 
-| Honeycomb adds interface ipv6 neighbor
+| Honeycomb adds interface IPv6 neighbor
 | | [Documentation] | Uses Honeycomb API to assign an ipv6 neighbor to the\
 | | ... | specified interface.
 | | ...
@@ -468,7 +468,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds interface ipv6 neighbor \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds interface IPv6 neighbor \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| 192.168.0.3 \| 08:00:27:c0:5d:37 \|
 | | [Arguments] | ${node} | ${interface} | ${fib_address} | ${fib_mac}
 | | InterfaceAPI.Add ipv6 neighbor
@@ -494,7 +494,7 @@
 | | ... | ip=${ip_address} | link-layer-address=${mac_address} | origin=static
 | | Should contain | ${api_data['ietf-ip:ipv6']['neighbor']} | ${settings}
 
-| Honeycomb clears all interface ipv6 neighbors
+| Honeycomb clears all interface IPv6 neighbors
 | | [Documentation] | Uses Honeycomb API to remove all ipv6 neighbors from the\
 | | ... | specified interface.
 | | ...
@@ -504,7 +504,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb clears all interface ipv6 neighbors \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb clears all interface IPv6 neighbors \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \|
 | | [Arguments] | ${node} | ${interface}
 | | interfaceAPI.Remove all ipv6 neighbors | ${node} | ${interface}
@@ -581,7 +581,7 @@
 | | ${vat_data}= | InterfaceCLI.VPP get interface data | ${node} | ${interface}
 | | Should be equal | ${vat_data['mtu']} | ${mtu}
 
-| Honeycomb sets interface vrf ID
+| Honeycomb sets interface VRF ID
 | | [Documentation] | Uses Honeycomb API to change interface vrf\
 | | ... | configuration.
 | | ...
@@ -592,13 +592,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb sets interface vrf ID \
+| | ... | \| Honeycomb sets interface VRF ID \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \| ipv4 \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version}
 | | interfaceAPI.Configure interface routing
 | | ... | ${node} | ${interface} | ${ip_version}-vrf-id | ${vrf_id}
 
-| Interface vrf ID from Honeycomb should be
+| Interface VRF ID from Honeycomb should be
 | | [Documentation] | Retrieves interface ethernet configuration\
 | | ... | through Honeycomb and compares with settings supplied in arguments.
 | | ...
@@ -610,7 +610,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface vrf ID from Honeycomb should be \
+| | ... | \| Interface VRF ID from Honeycomb should be \
 | | ... | should be \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \
 | | ... | \| ipv4 \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id} | ${ip_version}
@@ -618,7 +618,7 @@
 | | Should be equal
 | | ... | ${api_data['v3po:routing']['${ip_version}-vrf-id']} | ${vrf_id}
 
-| Interface vrf ID from VAT should be
+| Interface VRF ID from VAT should be
 | | [Documentation] | Retrieves interface ethernet configuration\
 | | ... | through VAT and compares with settings supplied in arguments.
 | | ...
@@ -629,7 +629,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface vrf ID from VAT should be \
+| | ... | \| Interface VRF ID from VAT should be \
 | | ... | \| ${nodes['DUT1']} \| GigabitEthernet0/8/0 \| ${1} \|
 | | [Arguments] | ${node} | ${interface} | ${vrf_id}
 | | ${vat_data}= | InterfaceCLI.get interface vrf table
@@ -692,7 +692,7 @@
 | | Should be equal as strings
 | | ... | ${api_data['if-index']} | ${sw_if_index}
 
-| Get Interface index from oper data
+| Get interface index from oper data
 | | [Documentation] | Retrieves interface operational data and returns\
 | | ... | if-index of the specified interface.
 | | ...
@@ -702,7 +702,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Get Interface index from oper data \| ${nodes['DUT1']} \| local0 \|
+| | ... | \| Get interface index from oper data \| ${nodes['DUT1']} \| local0 \|
 | | [Arguments] | ${node} | ${interface}
 | | ${data}= | interfaceAPI.Get interface oper data | ${node} | ${interface}
 | | Return from keyword | ${data['if-index']}
diff --git a/resources/libraries/robot/honeycomb/lisp.robot b/resources/libraries/robot/honeycomb/lisp.robot
index 0ee1314f71..cda8d827ba 100644
--- a/resources/libraries/robot/honeycomb/lisp.robot
+++ b/resources/libraries/robot/honeycomb/lisp.robot
@@ -17,7 +17,7 @@
 | Documentation | Keywords used to test Honeycomb Lisp features.
 
 *** Keywords ***
-| Honeycomb enables Lisp
+| Honeycomb enables LISP
 | | [Documentation] | Uses Honeycomb API to enable Lisp.
 | | ...
 | | ... | *Arguments:*
@@ -25,13 +25,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \|
+| | ... | \| Honeycomb enables LISP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
 | | Set Lisp state | ${node} | ${TRUE}
 
-| Honeycomb disables Lisp
+| Honeycomb disables LISP
 | | [Documentation] | Uses Honeycomb API to disable Lisp.
 | | ...
 | | ... | *Arguments:*
@@ -39,7 +39,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb disables Lisp \| ${nodes['DUT1']} \|
+| | ... | \| Honeycomb disables LISP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
@@ -55,8 +55,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \| GigabitEthernet0/8/0\
-| | ... | \| loc_01 \|
+| | ... | \| Honeycomb adds locator set \| ${nodes['DUT1']} \
+| | ... | \| GigabitEthernet0/8/0 \| loc_01 \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${locator_set}
 | | ...
@@ -77,7 +77,7 @@
 | | ...
 | | Configure Lisp Mapping | ${node} | ${data}
 
-| Honeycomb removes all Lisp mappings
+| Honeycomb removes all LISP mappings
 | | [Documentation] | Uses Honeycomb API to clear the eid-table.
 | | ...
 | | ... | *Arguments:*
@@ -85,13 +85,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb removes all Lisp mappings \| ${nodes['DUT1']} \|
+| | ... | \| Honeycomb removes all LISP mappings \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
 | | Configure lisp mapping | ${node} | ${NONE}
 
-| Lisp should not be configured
+| LISP should not be configured
 | | [Documentation] | Retrieves Lisp configuration from Honeycomb operational\
 | | ... | data, and expects an empty dictionary.
 | | ...
@@ -100,14 +100,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp should not be configured \| ${nodes['DUT1']} \|
+| | ... | \| LISP should not be configured \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
 | | Run keyword and Expect Error | KeyError: 'lisp-feature-data'
 | | ... | Get Lisp operational data | ${node}
 
-| Lisp state From Honeycomb Should Be
+| LISP state from Honeycomb should be
 | | [Documentation] | Retrieves Lisp state from Honeycomb operational\
 | | ... | data, and compares Lisp state with expected value.
 | | ...
@@ -117,7 +117,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp state From Honeycomb Should Be \| ${nodes['DUT1']} \
+| | ... | \| LISP state from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| enabled \|
 | | ...
 | | [Arguments] | ${node} | ${state}
@@ -130,7 +130,7 @@
 | | ... | Should be equal as strings
 | | ... | ${data['lisp-state']['enable']} | ${False}
 
-| Lisp state From VAT Should Be
+| LISP state from VAT should be
 | | [Documentation] | Retrieves Lisp state from VAT,\
 | | ... | and compares Lisp state with expected value.
 | | ...
@@ -140,14 +140,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp state From VAT Should Be \| ${nodes['DUT1']} \| enabled \|
+| | ... | \| LISP state from VAT should be \| ${nodes['DUT1']} \| enabled \|
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
 | | ${status}= | VPP show Lisp State | ${node}
 | | Should match | ${status['feature_status']} | ${state}
 
-| Lisp mapping From Honeycomb Should Be
+| LISP mapping from Honeycomb should be
 | | [Documentation] | Retrieves Lisp mapping from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
@@ -157,7 +157,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp mapping From Honeycomb Should Be \| ${nodes['DUT1']} \
+| | ... | \| LISP mapping from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| ${settings} \|
 | | ...
 | | [Arguments] | ${node} | ${settings}
@@ -167,7 +167,7 @@
 | | ${data}= | Set Variable | ${data['eid-table']['vni-table'][0]}
 | | Compare data structures | ${data} | ${settings}
 
-| Lisp mapping From VAT Should Be
+| LISP mapping from VAT should be
 | | [Documentation] | Retrieves Lisp mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
@@ -177,7 +177,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp mapping From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| LISP mapping from VAT should be \| ${nodes['DUT1']} \
 | | ... | \| ${settings} \|
 | | ...
 | | [Arguments] | ${node} | ${settings}
@@ -185,7 +185,7 @@
 | | ${data}= | VPP show Lisp eid table | ${node}
 | | Compare data structures | ${data[0]} | ${settings}
 
-| Lisp mappings from Honeycomb should not exist
+| LISP mappings from Honeycomb should not exist
 | | [Documentation] | Retrieves Lisp mappings from operational\
 | | ... | data, and expects to find none.
 | | ...
@@ -194,7 +194,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp mappings from Honeycomb should not exist \
+| | ... | \| LISP mappings from Honeycomb should not exist \
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
@@ -203,7 +203,7 @@
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | Should be empty | ${data['eid-table']['vni-table']}
 
-| Lisp mappings from VAT should not exist
+| LISP mappings from VAT should not exist
 | | [Documentation] | Retrieves Lisp mappings from VAT,\
 | | ... | and expects to receive an empty list.
 | | ...
@@ -212,7 +212,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Lisp mappings from VAT should not exist \| ${nodes['DUT1']} \|
+| | ... | \| LISP mappings from VAT should not exist \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
@@ -246,7 +246,7 @@
 | | ... | ${loc_data['locator-set'][0]['interface'][0]['interface-ref']}
 | | ... | ${interface}
 
-| Honeycomb adds Lisp adjacency
+| Honeycomb adds LISP adjacency
 | | [Documentation] | Uses Honeycomb API to configure Lisp adjacency.
 | | ...
 | | ... | *Arguments:*
@@ -258,7 +258,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp adjacency \| ${nodes['DUT1']} \| ${1} \| map1\
+| | ... | \| Honeycomb adds LISP adjacency \| ${nodes['DUT1']} \| ${1} \| map1\
 | | ... | \| adj1 \| ${data} \|
 | | ...
 | | [Arguments] | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
@@ -266,7 +266,7 @@
 | | Add Lisp adjacency
 | | ... | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
 
-| Honeycomb adds Lisp Map resolver
+| Honeycomb adds LISP map resolver
 | | [Documentation] | Uses Honeycomb API to configure Lisp map resolver.
 | | ...
 | | ... | *Arguments:*
@@ -275,7 +275,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp Map resolver \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds LISP map resolver \| ${nodes['DUT1']} \
 | | ... | \| 192.168.0.2 \|
 | | ...
 | | [Arguments] | ${node} | ${ip_address}
@@ -467,7 +467,7 @@
 | | ${data}= | Vpp show Lisp Map Request Mode | ${node}
 | | Should be equal | ${data['map_request_mode']} | ${destination}
 
-| Honeycomb enables Lisp PITR feature
+| Honeycomb enables LISP PITR feature
 | | [Documentation] | Uses Honeycomb API to configure Lisp PITR feature.
 | | ...
 | | ... | *Arguments:*
@@ -476,13 +476,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb enables Lisp PITR feature \| ${nodes['DUT1']} \| loc1 \|
+| | ... | \| Honeycomb enables LISP PITR feature \| ${nodes['DUT1']} \| loc1 \|
 | | ...
 | | [Arguments] | ${node} | ${locator_set}
 | | ...
 | | Configure PITR | ${node} | ${locator_set}
 
-| Honeycomb enables Lisp PETR feature
+| Honeycomb enables LISP PETR feature
 | | [Documentation] | Uses Honeycomb API to configure Lisp PETR feature.
 | | ...
 | | ... | *Arguments:*
@@ -491,14 +491,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb enables Lisp PETR feature \| ${nodes['DUT1']}\
+| | ... | \| Honeycomb enables LISP PETR feature \| ${nodes['DUT1']}\
 | | ... | \| 192.168.0.1 \|
 | | ...
 | | [Arguments] | ${node} | ${ip_address}
 | | ...
 | | Configure PETR | ${node} | ${ip_address}
 
-| Honeycomb enables Lisp RLOC feature
+| Honeycomb enables LISP RLOC feature
 | | [Documentation] | Uses Honeycomb API to enable the Lisp RLOC feature.
 | | ...
 | | ... | *Arguments:*
@@ -506,7 +506,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb enables Lisp RLOC feature\
+| | ... | \| Honeycomb enables LISP RLOC feature\
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
@@ -652,7 +652,7 @@
 | | Should be equal | ${data['status']} | enabled
 | | Should be equal | ${data['locator_set']} | ${locator_set}
 
-| Honeycomb disables all Lisp features
+| Honeycomb disables all LISP features
 | | [Documentation] | Uses Honeycomb API to remove all Lisp configuration.
 | | ...
 | | ... | *Arguments:*
@@ -660,7 +660,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb disables all Lisp features \| ${nodes['DUT1']} \|
+| | ... | \| Honeycomb disables all LISP features \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | ...
diff --git a/resources/libraries/robot/honeycomb/netconf.robot b/resources/libraries/robot/honeycomb/netconf.robot
index 75eaefbf25..1fd287dcd4 100644
--- a/resources/libraries/robot/honeycomb/netconf.robot
+++ b/resources/libraries/robot/honeycomb/netconf.robot
@@ -17,7 +17,7 @@
 | Documentation | Keywords for managing Netconf communication.
 
 *** Keywords ***
-| Netconf session is established
+| Netconf session should be established
 | | [Documentation] | Open a communication channel on the Netconf session\
 | | ... | and exchange hello messages.
 | | ...
@@ -26,7 +26,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Netconf session is established \| ${nodes['DUT1']} \|
+| | ... | \| Netconf session should be established \| ${nodes['DUT1']} \|
 | | [Arguments] | ${node}
 | | Create session | ${node} | ${hello}
 
diff --git a/resources/libraries/robot/honeycomb/notifications.robot b/resources/libraries/robot/honeycomb/notifications.robot
index 125e06c7a1..f46f7eec66 100644
--- a/resources/libraries/robot/honeycomb/notifications.robot
+++ b/resources/libraries/robot/honeycomb/notifications.robot
@@ -18,7 +18,7 @@
 | Documentation | Keywords used to test Honeycomb notifications over Netconf.
 
 *** Keywords ***
-| Notification listener is established
+| Notification listener should be established
 | | [Documentation] | Connects to Honeycomb notification service.
 | | ...
 | | ... | *Arguments:*
@@ -26,7 +26,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Notification listener is established \| ${nodes['DUT1']} \|
+| | ... | \| Notification listener should be established \| ${nodes['DUT1']} \|
 | | [Arguments] | ${node}
 | | Create session | ${node} | ${hello}
 | | Add notification listener | ${subscription}
diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot
index 2744ba6377..69f5f92d0d 100644
--- a/resources/libraries/robot/honeycomb/persistence.robot
+++ b/resources/libraries/robot/honeycomb/persistence.robot
@@ -26,7 +26,7 @@
 | Documentation | Keywords used to test Honeycomb persistence.
 
 *** Keywords ***
-| Honeycomb is restarted
+| Restart Honeycomb
 | | [Documentation] | Restarts Honeycomb without clearing persistence data.
 | | ...
 | | ... | *Arguments:*
@@ -34,14 +34,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb is restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart Honeycomb \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
 | | Log Persisted Configuration | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
-| VPP is restarted
+| Restart VPP
 | | [Documentation] | Restarts VPP and waits until it reconnects with Honeycomb.
 | | ...
 | | ... | *Arguments:*
@@ -49,7 +49,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| VPP is restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart VPP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | Setup DUT | ${node}
@@ -70,7 +70,7 @@
 | | Wait until keyword succeeds | 2min | 20sec
 | | ... | Check Honeycomb startup state | ${node}
 
-| Honeycomb and VPP are restarted
+| Restart Honeycomb and VPP
 | | [Documentation] | Stops Honeycomb, restarts VPP and then starts Honeycomb\
 | | ... | again.
 | | ...
@@ -79,13 +79,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb and VPP are restarted \| ${nodes['DUT1']} \|
+| | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
 | | Stop Honeycomb service on DUTs | ${node}
 | | Log Persisted Configuration | ${node}
 | | Setup DUT | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
 | Multi-Feature Persistence Test Configuration
 | | [Documentation] | Uses Honeycomb to set basic settings for VxLAN,\
@@ -111,7 +111,7 @@
 | | ... | ${node} | ${vhost_interface} | ${vhost_user_client}
 | | Honeycomb creates sub-interface | ${node} | ${interface}
 | | ... | ${sub_if_1_match} | ${sub_if_1_tags} | ${sub_if_1_settings}
-| | Honeycomb sets interface state | ${node} | ${interface} | up
+| | Honeycomb configures interface state | ${node} | ${interface} | up
 | | Honeycomb sets the sub-interface up
 | | ... | ${node} | ${interface} | ${sub_if_id}
 | | Honeycomb adds sub-interface to bridge domain
@@ -214,7 +214,7 @@
 | | Stop Honeycomb service on DUTs | ${node}
 | | Modify persistence files | ${node} | { | abc
 | | Setup DUT | ${node}
-| | Setup Honeycomb service on DUTs | ${node}
+| | Configure Honeycomb service on DUTs | ${node}
 
 | Log persisted configuration on node
 | | [Documentation] | Logs the content of Honeycomb's persitence files.
@@ -243,14 +243,14 @@
 | | [Arguments] | ${node}
 | | Honeycomb and VPP should have default configuration | ${node}
 | | Import Variables | resources/test_data/honeycomb/interface_ip.py
-| | Honeycomb sets interface state | ${node} | ${interface} | up
-| | Honeycomb sets interface ipv4 address with prefix
+| | Honeycomb configures interface state | ${node} | ${interface} | up
+| | Honeycomb sets interface IPv4 address with prefix
 | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix}
-| | Honeycomb adds interface ipv4 neighbor
+| | Honeycomb adds interface IPv4 neighbor
 | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac}
-| | Honeycomb sets interface ipv6 address
+| | Honeycomb sets interface IPv6 address
 | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix}
-| | Honeycomb adds interface ipv6 neighbor
+| | Honeycomb adds interface IPv6 neighbor
 | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac}
 
 | Interface Persistence Check
diff --git a/resources/libraries/robot/honeycomb/policer.robot b/resources/libraries/robot/honeycomb/policer.robot
index 965b0f3cb5..4319b27a21 100644
--- a/resources/libraries/robot/honeycomb/policer.robot
+++ b/resources/libraries/robot/honeycomb/policer.robot
@@ -85,7 +85,7 @@
 | | [Arguments] | ${node}
 | | Configure Policer | ${node} | ${policer_data['name']}
 
-| Policer test teardown
+| Tear down policer test
 | | [Documentation] | Uses Honeycomb API to remove Policer configuration\
 | | ... | and reset interface state.
 | | ...
@@ -133,7 +133,7 @@
 | | Disable Policer on interface
 | | ... | ${node} | ${interface}
 
-| Honeycomb Send Packet and Verify Marking
+| Honeycomb Send packet and verify marking
 | | [Documentation] | Send packet and verify DSCP of the received packet.
 | | ...
 | | ... | *Arguments:*
@@ -149,7 +149,7 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| ${dscp}= \| DSCP AF22 \|
-| | ... | \| Send Packet and Verify Marking \| ${nodes['TG']} \| eth1 \| eth2 \
+| | ... | \| Send packet and verify marking \| ${nodes['TG']} \| eth1 \| eth2 \
 | | ... | \| 08:00:27:87:4d:f7 \| 52:54:00:d4:d8:22 \| 192.168.122.2 \
 | | ... | \| 192.168.122.1 \| ${dscp} \|
 | | ...
diff --git a/resources/libraries/robot/honeycomb/port_mirroring.robot b/resources/libraries/robot/honeycomb/port_mirroring.robot
index 532b5157d8..63fbcea7a0 100644
--- a/resources/libraries/robot/honeycomb/port_mirroring.robot
+++ b/resources/libraries/robot/honeycomb/port_mirroring.robot
@@ -21,7 +21,7 @@
 | Library  | resources.libraries.python.Trace
 
 *** Keywords ***
-| Honeycomb Configures SPAN on interface
+| Honeycomb configures SPAN on interface
 | | [Documentation] | Uses Honeycomb API to configure SPAN on the specified\
 | | ... | interface, mirroring one or more interfaces.
 | | ...
@@ -33,7 +33,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb Configures SPAN on interface \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb configures SPAN on interface \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| [{'iface-ref': 'GigabitEthernet0/10/0', \
 | | ... | \| 'state': 'transmit'}, \
 | | ... | \| {'iface-ref': 'local0', 'state': 'both'}] \|
diff --git a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot
index dc15742b5b..7385f1c15f 100644
--- a/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot
+++ b/resources/libraries/robot/honeycomb/provider_backbone_bridge.robot
@@ -16,7 +16,7 @@
 | ...     | WITH NAME | IfAPI
 
 *** Keywords ***
-| Honeycomb Creates PBB Sub Interface
+| Honeycomb creates PBB sub-interface
 | | [Documentation] | Uses Honeycomb API to set PBB sub-interface on an\
 | | ... | interface.
 | | ...
@@ -37,7 +37,7 @@
 | | IfAPI.Create PBB Sub Interface
 | | ... | ${node} | ${super_if} | ${params}
 
-| Honeycomb Removes PBB Sub Interface
+| Honeycomb removes PBB sub-interface
 | | [Documentation] | Uses Honeycomb API to remove PBB sub-interface from its\
 | | ... | super interface.
 | | ...
@@ -94,7 +94,7 @@
 | | ... | ${node} | ${super_if} | ${sub_if_id}
 | | Should be empty | ${data}
 
-| Honeycomb Fails to Create PBB Sub Interface
+| Honeycomb fails to create PBB sub-interface
 | | [Documentation] | Uses Honeycomb API to set PBB sub-interface with wrong\
 | | ... | parameter(s) and expects to fail.
 | | ...
diff --git a/resources/libraries/robot/honeycomb/proxyarp.robot b/resources/libraries/robot/honeycomb/proxyarp.robot
index 209e213cf8..2df1d3c13a 100644
--- a/resources/libraries/robot/honeycomb/proxyarp.robot
+++ b/resources/libraries/robot/honeycomb/proxyarp.robot
@@ -149,7 +149,7 @@
 | | Variable Should Not Exist
 | | ... | ${oper_data['ietf-ip:ipv6']['nd-proxy:nd-proxies']['nd-proxy']}
 
-| Verify IPv6ND Proxy
+| Verify IPv6ND proxy
 | | [Documentation] | Send and receive ICMPv6 messages between TG interfaces
 | | ... | through Neighbor Discovery proxy.
 | | ...
@@ -171,7 +171,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Verify IPv6ND Proxy \| ${nodes['TG']} \
+| | ... | \| Verify IPv6ND proxy \| ${nodes['TG']} \
 | | ... | \| eth3 \| eth4 \| 3ffe:62::1 \| 3ffe:63::2 \
 | | ... | \| 08:00:27:cc:4f:54 \| 08:00:27:64:18:d2 \
 | | ... | \| 08:00:27:c9:6a:d5 \| 08:00:27:c4:75:3a \|
diff --git a/resources/libraries/robot/honeycomb/routing.robot b/resources/libraries/robot/honeycomb/routing.robot
index 7e38ef1e52..752b4fe29e 100644
--- a/resources/libraries/robot/honeycomb/routing.robot
+++ b/resources/libraries/robot/honeycomb/routing.robot
@@ -83,7 +83,7 @@
 | | [Arguments] | ${node} | ${name}
 | | Delete routing table | ${node} | ${name}
 
-| Verify Route IPv4
+| Verify route IPv4
 | | [Documentation] | Send an ICMP packet from one TG interface and receive\
 | | ... | it on the other TG interface.
 | | ...
@@ -102,7 +102,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Verify Route IPv4 \| ${nodes['TG']} \
+| | ... | \| Verify route IPv4 \| ${nodes['TG']} \
 | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth1 \| 08:00:27:cc:4f:54 \
 | | ... | \| eth2 \| 08:00:27:c9:6a:d5 \|
 | | ...
@@ -118,7 +118,7 @@
 | | ...                 | --rx_if | ${rx_port_name}
 | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Verify Route IPv6
+| Verify route IPv6
 | | [Documentation] | Send an ICMPv6 packet from one TG interface and receive\
 | | ... | it on the other TG interface.
 | | ...
@@ -137,7 +137,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Verify Route IPv6 \| ${nodes['TG']} \
+| | ... | \| Verify route IPv6 \| ${nodes['TG']} \
 | | ... | \| 10::1 \| 11::1 \| eth2 \| 08:00:27:cc:4f:54 \
 | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \|
 | | ...
diff --git a/resources/libraries/robot/honeycomb/slaac.robot b/resources/libraries/robot/honeycomb/slaac.robot
index 10e4887dca..966f95fa42 100644
--- a/resources/libraries/robot/honeycomb/slaac.robot
+++ b/resources/libraries/robot/honeycomb/slaac.robot
@@ -17,7 +17,7 @@
 | Documentation | Keywords used to test SLAAC using Honeycomb.
 
 *** Keywords ***
-| Honeycomb Configures SLAAC
+| Honeycomb configures SLAAC
 | | [Documentation] | Uses Honeycomb API to configure SLAAC on the specified\
 | | ... | interface.
 | | ...
@@ -28,7 +28,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb Configures SLAAC \| ${node} \| ${interface} \
+| | ... | \| Honeycomb configures SLAAC \| ${node} \| ${interface} \
 | | ... | \| ${slaac_data} \|
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${slaac_data}
@@ -103,4 +103,4 @@
 | | [Arguments] | ${node} | ${interface}
 | | Honeycomb removes SLAAC configuration | ${node} | ${interface}
 | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | down
-| | Honeycomb removes interface ipv6 addresses | ${node} | ${interface}
+| | Honeycomb removes interface IPv6 addresses | ${node} | ${interface}