CSIT-662: KWI - KW renaming

- plus: CSIT-656: Script to rename robot keywords. Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21 Signed-off-by: Tibor Frank <tifrank@cisco.com>
author: Tibor Frank <tifrank@cisco.com> 2017-06-01 07:00:50 +0200
committer: Tibor Frank <tifrank@cisco.com> 2017-06-08 14:23:08 +0200
commit: 430afafb4cadf503ccee99c09f6de7402f5404c7 (patch)
tree: ef79d59dba8558b85af1b7ad2fe89d3c9c49b5af /resources
parent: 7436d8bdf60bca9b80fb76781e1f709bbcd435da (diff)
40 files changed, 891 insertions, 645 deletions
diff --git a/resources/libraries/robot/DPDK/default.robot b/resources/libraries/robot/DPDK/default.robot
index 070350a082..e6921c9b27 100644
--- a/resources/libraries/robot/DPDK/default.robot
+++ b/resources/libraries/robot/DPDK/default.robot
@@ -22,7 +22,7 @@
 | Library | Collections
 
 *** Keywords ***
-| Start L2FWD '${m}' worker threads and rxqueues '${n}' with jumbo frames '${b}'
+| Start L2FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}'
 | | [Documentation] | Start the l2fwd with M worker threads without SMT
 | | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs.
 | | ...
@@ -44,7 +44,7 @@
 | | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues}
 | | ... | ${jumbo_frames}
 
-| Start L2FWD '${m}' worker threads using SMT and rxqueues '${n}' with jumbo frames '${b}'
+| Start L2FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}'
 | | [Documentation] | Start the l2fwd with M worker threads with SMT
 | | ... | and rxqueues N and B (yes or no) jumbo frames in all DUTs.
 | | ...
@@ -67,8 +67,8 @@
 | | Start the l2fwd test | ${dut2} | ${dut2_cpus} | ${nb_cores} | ${rxqueues}
 | | ... | ${jumbo_frames}
 
-| Start L3FWD '${m}' worker threads and rxqueues '${n}' with jumbo frames '${b}'
-| | [Documentation] |  Start the l3fwd with M worker threads without SMT
+| Start L3FWD '${m}' worker threads and '${n}' rxqueues with jumbo frames '${b}'
+| | [Documentation] | Start the l3fwd with M worker threads without SMT
 | | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs.
 | | ${cpu_cnt}= | Convert To Integer | ${m}
 | | ${nb_cores}= | Convert to String | ${m}
@@ -87,8 +87,8 @@
 | | Start the l3fwd test | ${nodes} | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | ... | ${nb_cores} | ${dut2_cpus} | ${rxqueues} | ${jumbo_frames}
 
-| Start L3FWD '${m}' worker threads using SMT and rxqueues '${n}' with jumbo frames '${b}'
-| | [Documentation] |  Start the l3fwd with M worker threads with SMT
+| Start L3FWD '${m}' worker threads using SMT and '${n}' rxqueues with jumbo frames '${b}'
+| | [Documentation] | Start the l3fwd with M worker threads with SMT
 | | ... | and rxqueues N and B(yes or no) jumbo frames in all DUTs.
 | | ${cpu_cnt}= | Convert To Integer | ${m}
 | | ${nb_cores_int}= | Evaluate | ${cpu_cnt}*2
diff --git a/resources/libraries/robot/bridge_domain.robot b/resources/libraries/robot/bridge_domain.robot
index 5707a82ade..22e46a02cb 100644
--- a/resources/libraries/robot/bridge_domain.robot
+++ b/resources/libraries/robot/bridge_domain.robot
@@ -20,7 +20,7 @@
 | Resource | resources/libraries/robot/l2_traffic.robot
 
 *** Keywords ***
-| Vpp l2bd forwarding setup
+| Configure L2BD forwarding
 | | [Documentation] | Setup BD between 2 interfaces on VPP node and if learning
 | | ...             | is off set static L2FIB entry on second interface
 | | [Arguments] | ${node} | ${if1} | ${if2} | ${learn}=${TRUE} | ${mac}=${EMPTY}
@@ -31,7 +31,7 @@
 | | ... | Vpp Add L2fib Entry | ${node} | ${mac} | ${if2} | ${1}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Path for 3-node BD-SHG testing is set
+| Configure path for 3-node BD-SHG test
 | | [Documentation] | Compute path for bridge domain split-horizon group testing
 | | ...             | on three given nodes with following interconnections
 | | ...             | TG - (2 links) - DUT1 - (1 link) - DUT2 - (2 links) - TG
@@ -62,7 +62,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path for 3-node BD-SHG test \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \|
 | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node}
 | | # Compute path TG - DUT1 with two links in between
@@ -101,7 +101,7 @@
 | | Set Test Variable | ${dut1_node}
 | | Set Test Variable | ${dut2_node}
 
-| Interfaces in 3-node BD-SHG testing are up
+| Set interfaces in 3-node BD-SHG test up
 | | [Documentation] | Set UP state on interfaces in 3-node path on nodes and
 | | ...             | wait for all interfaces are ready.
 | | ...
@@ -112,13 +112,13 @@
 | | ... | - No value returned.
 | | ...
 | | ... | _NOTE:_ This KW uses test variables sets in
-| | ... |         "Path for 3-node BD-SHG testing is set" KW.
+| | ... |         "Configure path for 3-node BD-SHG test" KW.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Path for 3-node BD-SHG testing is set \| ${nodes['TG']} \
+| | ... | \| Configure path for 3-node BD-SHG test \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \|
-| | ... | \| Interfaces in 3-node BD-SHG testing are up \|
+| | ... | \| Set interfaces in 3-node BD-SHG test up \|
 | | ...
 | | Set Interface State | ${tg_node} | ${tg_to_dut1_if1} | up
 | | Set Interface State | ${tg_node} | ${tg_to_dut1_if2} | up
@@ -133,7 +133,7 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | Vpp Node Interfaces Ready Wait | ${dut2_node}
 
-| Bridge domain on DUT node is created
+| Create bridge domain
 | | [Documentation] | Create bridge domain on given VPP node with defined
 | | ...             | learning status.
 | | ...
@@ -148,14 +148,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 2 \|
-| | ... | \| Bridge domain on DUT node is created \| ${nodes['DUT1']} \| 5 \
+| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 2 \|
+| | ... | \| Create bridge domain \| ${nodes['DUT1']} \| 5 \
 | | ... | \| learn=${FALSE} \|
 | | [Arguments] | ${dut_node} | ${bd_id} | ${learn}=${TRUE}
 | | ${learn} = | Set Variable If | ${learn} == ${TRUE} | ${1} | ${0}
 | | Create L2 BD | ${dut_node} | ${bd_id} | learn=${learn}
 
-| Interface is added to bridge domain
+| Add interface to bridge domain
 | | [Documentation] | Set given interface admin state to up and add this
 | | ...             | interface to required L2 bridge domain on defined
 | | ...             | VPP node.
@@ -171,13 +171,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Interface is added to bridge domain \| ${nodes['DUT2']} \
+| | ... | \| Add interface to bridge domain \| ${nodes['DUT2']} \
 | | ... | \| GigabitEthernet0/8/0 \| 3 \|
 | | [Arguments] | ${dut_node} | ${dut_if} | ${bd_id} | ${shg}=0
 | | Set Interface State | ${dut_node} | ${dut_if} | up
 | | Add Interface To L2 BD | ${dut_node} | ${dut_if} | ${bd_id} | ${shg}
 
-| Destination port is added to L2FIB on DUT node
+| Add destination port to L2FIB
 | | [Documentation] | Create a static L2FIB entry for required destination port
 | | ...             | on defined interface and bridge domain ID
 | | ...             | of the given VPP node.
@@ -194,14 +194,14 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Destination port is added to L2FIB on DUT node \| ${nodes['TG']} \
+| | ... | \| Add destination port to L2FIB \| ${nodes['TG']} \
 | | ... | \| eth1 \| ${nodes['DUT2']} \| GigabitEthernet0/8/0 \| 3 \|
 | | [Arguments] | ${dest_node} | ${dest_node_if} | ${vpp_node}
 | | ...         | ${vpp_node_if} | ${bd_id}
 | | ${mac}= | Get Interface Mac | ${dest_node} | ${dest_node_if}
 | | Vpp Add L2fib Entry | ${vpp_node} | ${mac} | ${vpp_node_if} | ${bd_id}
 
-| VM for Vhost L2BD forwarding is setup
+| Configure VM for vhost L2BD forwarding
 | | [Documentation] | Setup QEMU and start VM with two vhost interfaces.
 | | ...
 | | ... | *Arguments:*
@@ -216,9 +216,9 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT1']} \
+| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT1']} \
 | | ... | \| /tmp/sock1 \| /tmp/sock2 \|
-| | ... | \| VM for Vhost L2BD forwarding is setup \| ${nodes['DUT2']} \
+| | ... | \| Configure VM for vhost L2BD forwarding \| ${nodes['DUT2']} \
 | | ... | \| /tmp/sock1 \| /tmp/sock2 \| qemu_instance_2 \|
 | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${qemu_name}=vm_node
 | | Run Keyword Unless | "${qemu_name}" == "vm_node" | Import Library
@@ -246,7 +246,7 @@
 | | Set Interface State | ${vm} | ${br} | up | if_type=name
 | | Set Test Variable | ${${qemu_name}} | ${vm}
 
-| VPP Vhost interfaces for L2BD forwarding are setup
+| Configure vhost interfaces for L2BD forwarding
 | | [Documentation] | Create two Vhost-User interfaces on defined VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -264,9 +264,9 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \
+| | ... | \| Configure vhost interfaces for L2BD forwarding \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \|
-| | ... | \| VPP Vhost interfaces for L2BD forwarding are setup \
+| | ... | \| Configure vhost interfaces for L2BD forwarding \
 | | ... | \| ${nodes['DUT2']} \| /tmp/sock1 \| /tmp/sock2 \| dut2_vhost_if1 \
 | | ... | \| dut2_vhost_if2 \|
 | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1
diff --git a/resources/libraries/robot/counters.robot b/resources/libraries/robot/counters.robot
index 9c1339a833..3591dd5fe7 100644
--- a/resources/libraries/robot/counters.robot
+++ b/resources/libraries/robot/counters.robot
@@ -21,12 +21,12 @@
 | | [Arguments] | ${nodes}
 | | Vpp Nodes Clear Interface Counters | ${nodes}
 
-| Vpp dump stats
+| Get interface statistics
 | | [Documentation] | Dump stats table on VPP node
 | | [Arguments] | ${node}
 | | Vpp Dump Stats Table | ${node}
 
-| Vpp get interface ipv6 counter
+| Get interface ipv6 counter
 | | [Documentation] | Return IPv6 statistics for node interface
 | | [Arguments] | ${node} | ${interface}
 | | ${ipv6_counter}= | Vpp Get Ipv6 Interface Counter | ${node} | ${interface}
@@ -43,9 +43,9 @@
 | | Sleep | 10 | Waiting for statistics to be collected
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | Vpp show stats | ${nodes['${dut}']}
+| | | Show vpp statistics | ${nodes['${dut}']}
 
-| Vpp show stats
+| Show vpp statistics
 | | [Documentation] | Show [error, hardware, interface] stats
 | | [Arguments] | ${node}
 | | Vpp Show Errors | ${node}
@@ -58,7 +58,7 @@
 | | Clear runtime counters on all DUTs
 | | Clear interface counters on all DUTs
 | | Clear hardware counters on all DUTs
-| | Clear errors counters on all DUTs
+| | Clear error counters on all DUTs
 
 | Clear runtime counters on all DUTs
 | | [Documentation] | Clear VPP runtime counters on all DUTs
@@ -78,7 +78,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Vpp clear hardware counters | ${nodes['${dut}']}
 
-| Clear errors counters on all DUTs
+| Clear error counters on all DUTs
 | | [Documentation] | Clear VPP errors counters on all DUTs
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot
index fd1b280b94..c660736c97 100644
--- a/resources/libraries/robot/default.robot
+++ b/resources/libraries/robot/default.robot
@@ -26,17 +26,17 @@
 | Library | Collections
 
 *** Keywords ***
-| Setup all DUTs before test
+| Configure all DUTs before test
 | | [Documentation] | Setup all DUTs in topology before test execution.
 | | ...
 | | Setup All DUTs | ${nodes}
 
-| Setup all TGs before traffic script
+| Configure all TGs for traffic script
 | | [Documentation] | Prepare all TGs before traffic scripts execution.
 | | ...
 | | All TGs Set Interface Default Driver | ${nodes}
 
-| Show Vpp Version On All DUTs
+| Show VPP version on all DUTs
 | | [Documentation] | Show VPP version verbose on all DUTs.
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
@@ -50,7 +50,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Vpp Show Errors | ${nodes['${dut}']}
 
-| Show Vpp Trace Dump On All DUTs
+| Show VPP trace dump on all DUTs
 | | [Documentation] | Save API trace and dump output on all DUTs.
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
@@ -58,7 +58,7 @@
 | | | Vpp api trace save | ${nodes['${dut}']}
 | | | Vpp api trace dump | ${nodes['${dut}']}
 
-| Show Vpp Vhost On All DUTs
+| Show VPP vhost on all DUTs
 | | [Documentation] | Show Vhost User on all DUTs.
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
@@ -80,7 +80,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Set VPP Scheduling rr | ${nodes['${dut}']}
 
-| Verify Crypto Device On All DUTs
+| Configure crypto device on all DUTs
 | | [Documentation] | Verify if Crypto QAT device virtual functions are
 | | ... | initialized on all DUTs. If parameter force_init is set to True, then
 | | ... | try to initialize.
@@ -90,7 +90,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Verify Crypto Device On All DUTs \| ${True} \|
+| | ... | \| Configure crypto device on all DUTs \| ${True} \|
 | | ...
 | | [Arguments] | ${force_init}=${False}
 | | ...
@@ -98,7 +98,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Crypto Device Verify | ${nodes['${dut}']} | force_init=${force_init}
 
-| Verify Kernel Module On All DUTs
+| Configure kernel module on all DUTs
 | | [Documentation] | Verify if specific kernel module is loaded on all DUTs.
 | | ... | If parameter force_load is set to True, then try to initialize.
 | | ...
@@ -108,7 +108,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Verify Kernel Module On All DUTs \| ${True} \|
+| | ... | \| Configure kernel module on all DUTs \| ${True} \|
 | | ...
 | | [Arguments] | ${module} | ${force_load}=${False}
 | | ...
@@ -117,7 +117,7 @@
 | | | Kernel Module Verify | ${nodes['${dut}']} | ${module}
 | | | ... | force_load=${force_load}
 
-| Add '${m}' worker threads and rxqueues '${n}' in 3-node single-link topo
+| Add '${m}' worker threads and '${n}' rxqueues in 3-node single-link circular topology
 | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\
 | | ... | configuration on all DUTs in 3-node single-link topology.
 | | ...
@@ -144,7 +144,7 @@
 | | Add rxqueues config | ${dut1} | ${rxqueues}
 | | Add rxqueues config | ${dut2} | ${rxqueues}
 
-| Add '${m}' worker threads and rxqueues '${n}' in 2-node single-link topo
+| Add '${m}' worker threads and '${n}' rxqueues in 2-node single-link circular topology
 | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\
 | | ... | configuration on all DUTs in 2-node single-link topology.
 | | ...
@@ -161,7 +161,7 @@
 | | Add CPU config | ${dut1} | ${dut1_cpu}
 | | Add rxqueues config | ${dut1} | ${rxqueues}
 
-| Add '${m}' worker threads using SMT and rxqueues '${n}' in 3-node single-link topo
+| Add '${m}' worker threads using SMT and '${n}' rxqueues in 3-node single-link circular topology
 | | [Documentation] | Setup M worker threads using SMT and N rxqueues in vpp\
 | | ... | startup configuration on all DUTs in 3-node single-link topology.
 | | ...
@@ -188,7 +188,7 @@
 | | Add rxqueues config | ${dut1} | ${rxqueues}
 | | Add rxqueues config | ${dut2} | ${rxqueues}
 
-| Add '${m}' worker threads using SMT and rxqueues '${n}' in 2-node single-link topo
+| Add '${m}' worker threads using SMT and '${n}' rxqueues in 2-node single-link circular topology
 | | [Documentation] | Setup M worker threads and N rxqueues in vpp startup\
 | | ... | configuration on all DUTs in 2-node single-link topology.
 | | ...
@@ -249,7 +249,7 @@
 | | ...
 | | Add PCI device | ${node} | ${pci_address}
 
-| Add Heapsize Config to all DUTs
+| Add heapsize config to all DUTs
 | | [Documentation] | Add Add Heapsize Config to VPP startup configuration\
 | | ... | to all DUTs.
 | | ...
@@ -258,7 +258,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Add Heapsize Config to all DUTs \| 200M \|
+| | ... | \| Add heapsize config to all DUTs \| 200M \|
 | | ...
 | | [Arguments] | ${heapsize}
 | | ...
@@ -266,7 +266,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Add Heapsize Config | ${nodes['${dut}']} | ${heapsize}
 
-| Add No Multi Seg to all DUTs
+| Add no multi seg to all DUTs
 | | [Documentation] | Add No Multi Seg to VPP startup configuration to all DUTs.
 | | ...
 | | ${duts}= | Get Matches | ${nodes} | DUT*
@@ -288,7 +288,7 @@
 | | :FOR | ${dut} | IN | @{duts}
 | | | Add SNAT Config | ${nodes['${dut}']}
 
-| Add Cryptodev to all DUTs
+| Add cryptodev to all DUTs
 | | [Documentation] | AddCryptodev to VPP startup configuration to all
 | | ...             | DUTs
 | | ...
@@ -297,7 +297,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Add Cryptodev to all DUTs \| ${4} \|
+| | ... | \| Add cryptodev to all DUTs \| ${4} \|
 | | ...
 | | [Arguments] | ${count}
 | | ${duts}= | Get Matches | ${nodes} | DUT*
@@ -323,7 +323,7 @@
 | | [Documentation] | Setup default startup configuration of VPP to all DUTs.
 | | ...
 | | Remove startup configuration of VPP from all DUTs
-| | Add '1' worker threads and rxqueues '1' in 3-node single-link topo
+| | Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | Add all PCI devices to all DUTs
 | | Apply startup configuration on all VPP DUTs
 
@@ -331,7 +331,7 @@
 | | [Documentation] | Setup default startup configuration of VPP to all DUTs.
 | | ...
 | | Remove startup configuration of VPP from all DUTs
-| | Add '1' worker threads and rxqueues '1' in 2-node single-link topo
+| | Add '1' worker threads and '1' rxqueues in 2-node single-link circular topology
 | | Add all PCI devices to all DUTs
 | | Apply startup configuration on all VPP DUTs
 
@@ -358,7 +358,7 @@
 | | | ... | FAIL | More then one VPP PID found on node ${key}: ${pid}
 | | Set Test Variable | ${setup_vpp_pids}
 
-| Check VPP PID in Teardown
+| Verify VPP PID in Teardown
 | | [Documentation] | Check if the VPP PIDs on all DUTs are the same at the end\
 | | ... | of test as they were at the begining. If they are not, only a message\
 | | ... | is printed on console and to log. The test will not fail.
@@ -373,19 +373,19 @@
 | | Run Keyword And Return If | '${rc}'=='FAIL' | Log | ${err_msg}
 | | ... | console=yes | level=WARN
 
-| Func Test Setup
+| Set up functional test
 | | [Documentation] | Common test setup for functional tests.
 | | ...
-| | Setup all DUTs before test
+| | Configure all DUTs before test
 | | Save VPP PIDs
-| | Setup all TGs before traffic script
+| | Configure all TGs for traffic script
 | | Update All Interface Data On All Nodes | ${nodes}
 | | Reset VAT History On All DUTs | ${nodes}
 
-| Func Test Teardown
+| Tear down functional test
 | | [Documentation] | Common test teardown for functional tests.
 | | ...
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Show VAT History On All DUTs | ${nodes}
 | | Vpp Show Errors On All DUTs | ${nodes}
-| | Check VPP PID in Teardown
+| | Verify VPP PID in Teardown
diff --git a/resources/libraries/robot/dhcp_client.robot b/resources/libraries/robot/dhcp_client.robot
index 6c21fc8903..192ab2b729 100644
--- a/resources/libraries/robot/dhcp_client.robot
+++ b/resources/libraries/robot/dhcp_client.robot
@@ -19,7 +19,7 @@
 | Documentation | DHCP Client specific keywords.
 
 *** Keywords ***
-| Check DHCP DISCOVER header
+| Verify DHCP DISCOVER header
 | | [Documentation] | Check if DHCP DISCOVER message contains all required
 | | ... | fields.
 | | ...
@@ -36,9 +36,9 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \
+| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \|
-| | ... | \| Check DHCP DISCOVER header \| ${nodes['TG']} \
+| | ... | \| Verify DHCP DISCOVER header \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| client-hostname \|
 | | ...
 | | [Arguments] | ${tg_node} | ${interface} | ${src_mac} | ${hostname}=${EMPTY}
@@ -50,7 +50,7 @@
 | | ... | ${tg_node} | ${args}
 
 
-| Check DHCP REQUEST after OFFER
+| Verify DHCP REQUEST after OFFER
 | | [Documentation] | Check if DHCP REQUEST message contains all required
 | | ... | fields. DHCP REQUEST should be send by a client after DHCP OFFER
 | | ... | message sent by a server.
@@ -80,12 +80,12 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Check DHCP REQUEST after OFFER \| ${nodes['TG']} \
+| | ... | \| Verify DHCP REQUEST after OFFER \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \|
 | | ...
 | | ... | \| Run Keyword And Expect Error \| DHCP REQUEST Rx timeout \
-| | ... | \| Check DHCP REQUEST after OFFER \
+| | ... | \| Verify DHCP REQUEST after OFFER \
 | | ... | \| ${nodes['TG']} \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 08:00:27:46:2b:4c \| 192.168.23.10 \| 255.255.255.0 \
 | | ... | \| offer_xid=11113333 \|
@@ -106,7 +106,7 @@
 | | ... | ${tg_node} | ${args}
 
 
-| Send IP configuration to client via DHCP
+| Configure IP on client via DHCP
 | | [Documentation] | Run script that sends IP configuration to the DHCP client.
 | | ...
 | | ... | *Arguments:*
@@ -125,7 +125,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send IP configuration to client via DHCP \| ${nodes['TG']} \
+| | ... | \| Configure IP on client via DHCP \| ${nodes['TG']} \
 | | ... | \| eth2 \| 08:00:27:66:b8:57 \| 192.168.23.1 \
 | | ... | \| 192.168.23.10 \| 255.255.255.0 \| 86400 \|
 | | ...
diff --git a/resources/libraries/robot/dhcp_proxy.robot b/resources/libraries/robot/dhcp_proxy.robot
index b6948dc384..e2b16e5149 100644
--- a/resources/libraries/robot/dhcp_proxy.robot
+++ b/resources/libraries/robot/dhcp_proxy.robot
@@ -19,7 +19,7 @@
 | Documentation | DHCP Proxy specific keywords.
 
 *** Keywords ***
-| Send DHCP Messages
+| Send DHCP messages and check answer
 | | [Documentation] | Send and receive DHCP messages between client
 | | ...             | and server through DHCP proxy.
 | | ...
@@ -38,7 +38,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send DHCP Messages \| ${nodes['TG']} \
+| | ... | \| Send DHCP messages and check answer \| ${nodes['TG']} \
 | | ... | \| eth3 \| eth4 \| 192.168.0.100 \| 08:00:27:cc:4f:54 \
 | | ... | \| 172.16.0.2 \| 08:00:27:64:18:d2 \| 172.16.0.1 \|
 | | ...
@@ -57,7 +57,7 @@
 | | Run Traffic Script On Node | dhcp/send_and_check_proxy_messages.py
 | | ... | ${tg_node} | ${args}
 
-| Send DHCP DISCOVER
+| Send DHCP DISCOVER and check answer
 | | [Documentation] | Send and receive DHCP DISCOVER.
 | | ...
 | | ... | *Arguments:*
@@ -72,7 +72,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send DHCP DISCOVER \| ${nodes['TG']} \
+| | ... | \| Send DHCP DISCOVER and check answer \| ${nodes['TG']} \
 | | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.255 \|
 | | ...
 | | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
@@ -86,7 +86,7 @@
 | | Run Traffic Script On Node | dhcp/send_and_check_proxy_discover.py
 | | ... | ${tg_node} | ${args}
 
-| Send DHCP DISCOVER should fail
+| DHCP DISCOVER should fail
 | | [Documentation] | Send and receive DHCP DISCOVER should fail.
 | | ...
 | | ... | *Arguments:*
@@ -101,7 +101,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send DHCP DISCOVER should fail \| ${nodes['TG']} \
+| | ... | \| DHCP DISCOVER should fail \| ${nodes['TG']} \
 | | ... | \| eth3 \| eth4 \| 0.0.0.0 \| 255.255.255.1 \|
 | | ...
 | | [Arguments] | ${tg_node} | ${tg_interface1} | ${tg_interface2}
diff --git a/resources/libraries/robot/double_qemu_setup.robot b/resources/libraries/robot/double_qemu_setup.robot
index d8b32bd2fa..377e222804 100644
--- a/resources/libraries/robot/double_qemu_setup.robot
+++ b/resources/libraries/robot/double_qemu_setup.robot
@@ -14,7 +14,7 @@
 | Library | resources.libraries.python.IPUtil
 
 *** Keywords ***
-| Setup QEMU Vhost and Run
+| Configure QEMU vhost and run it
 | | [Documentation] | Setup Qemu with 4 vhost-user interfaces and 4 namespaces.
 | | ...             | Each call will be different object instance.
 | | ...
@@ -72,7 +72,7 @@
 | | ... | ${vm} | nmspace4 | ${vhost4} | ${ip4} | ${prefix_length}
 | | Set Test Variable | ${${qemu_name}} | ${vm}
 
-| Qemu Teardown
+| Tear down QEMU
 | | [Documentation] | Stop specific qemu instance
 | | ...             | running on ${dut_node}, ${vm} is VM node info dictionary
 | | ...             | returned by qemu_start or None.
@@ -83,7 +83,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Qemu Teardown \| ${node['DUT1']} \| ${vm} \| qemu_node_1 \|
+| | ... | \| Tear down QEMU \| ${node['DUT1']} \| ${vm} \| qemu_node_1 \|
 | | ...
 | | [Arguments] | ${dut_node} | ${vm} | ${qemu_name}
 | | ${set_node}= | Replace Variables | ${qemu_name}.Qemu Set Node
diff --git a/resources/libraries/robot/gre.robot b/resources/libraries/robot/gre.robot
index 6ff0d989dd..c237e883a3 100644
--- a/resources/libraries/robot/gre.robot
+++ b/resources/libraries/robot/gre.robot
@@ -15,8 +15,8 @@
 | Resource | resources/libraries/robot/interfaces.robot
 
 *** Keywords ***
-| GRE tunnel interface is created and up
-| | [Documentation] | Create GRE tunnel interface on defined VPP node and put \
+| Create GRE tunnel interface and set it up
+| | [Documentation] | Create GRE tunnel interface and set it up on defined VPP node and put \
 | | ... | the interface to UP state.
 | | ...
 | | ... | *Arguments:*
@@ -33,11 +33,11 @@
 | | ... | *Example:*
 | | ...
 | | ... | \| ${gre_name} \| ${gre_index}= \
-| | ... | \| GRE tunnel interface is created and up \| ${dut} \
+| | ... | \| Create GRE tunnel interface and set it up \| ${dut} \
 | | ... | \| 192.0.1.1 \| 192.0.1.2 \|
 | | ...
 | | [Arguments] | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
-| | ${name} | ${index}= | Create GRE Tunnel Interface
+| | ${name} | ${index}= | Create GRE tunnel interface
 | | ... | ${dut_node} | ${source_ip_address} | ${destination_ip_address}
 | | Set Interface State | ${dut_node} | ${index} | up
 | | [Return] | ${name} | ${index}
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}
diff --git a/resources/libraries/robot/interfaces.robot b/resources/libraries/robot/interfaces.robot
index 60e1480633..1161e85174 100644
--- a/resources/libraries/robot/interfaces.robot
+++ b/resources/libraries/robot/interfaces.robot
@@ -16,12 +16,12 @@
 | Resource | resources/libraries/robot/vat/interfaces.robot
 
 *** Keywords ***
-| VPP reports interfaces on | [Arguments] | ${node}
+| Report VPP interfaces | [Arguments] | ${node}
 | | VPP reports interfaces through VAT on | ${node}
 #| | VPP reports interfaces through ODL on | ${node}
 #| | VPP reports interfaces through DEBUGCLI on | ${node}
 
-| Setup MTU on TG based on MTU on DUT
+| Configure MTU on TG based on MTU on DUT
 | | [Documentation] | Type of the tg_node must be TG and dut_node must be DUT
 | | [Arguments] | ${tg_node} | ${dut_node}
 | | Append Nodes | ${tg_node} | ${dut_node}
diff --git a/resources/libraries/robot/ipsec.robot b/resources/libraries/robot/ipsec.robot
index 9c9980341f..7b8fab5b66 100644
--- a/resources/libraries/robot/ipsec.robot
+++ b/resources/libraries/robot/ipsec.robot
@@ -27,7 +27,7 @@
 | Documentation | *IPsec keywords.*
 
 *** Keywords ***
-| IPsec Generate Keys
+| Generate keys for IPSec
 | | [Documentation] | Generate keys for IPsec.
 | | ...
 | | ... | *Arguments:*
@@ -41,7 +41,7 @@
 | | ... | *Example:*
 | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
 | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
-| | ... | \| IPsec Generate Keys \| ${encr_alg} \| ${auth_alg} \|
+| | ... | \| Generate keys for IPSec \| ${encr_alg} \| ${auth_alg} \|
 | | [Arguments] | ${crypto_alg} | ${integ_alg}
 | | ${encr_key_len}= | Get Crypto Alg Key Len | ${crypto_alg}
 | | ${encr_key}= | Generate Random String | ${encr_key_len}
@@ -50,7 +50,7 @@
 | | Set Test Variable | ${encr_key}
 | | Set Test Variable | ${auth_key}
 
-| Setup Path for IPsec testing
+| Configure path for IPSec test
 | | [Documentation] | Setup path for IPsec testing TG<-->DUT1.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
@@ -63,7 +63,7 @@
 | | ... | - dut_lo - DUT loopback interface. Type: string
 | | ...
 | | ... | *Example:*
-| | ... | \| Setup Path for IPsec testing \|
+| | ... | \| Configure path for IPSec test \|
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']}
 | | Compute Path
 | | ${tg_if} | ${tg_node}= | Next Interface
@@ -82,7 +82,7 @@
 | | Set Test Variable | ${dut_if_mac}
 | | Set Test Variable | ${dut_lo}
 
-| Setup Topology for IPv4 IPsec testing
+| Configure topology for IPv4 IPsec testing
 | | [Documentation] | Setup topology for IPv4 IPsec testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
@@ -92,8 +92,8 @@
 | | ... | - tg_src_ip - TG source IP address. Type: string
 | | ...
 | | ... | *Example:*
-| | ... | \| Setup Topology for IPv4 IPsec testing \|
-| | Setup Path for IPsec testing
+| | ... | \| Configure topology for IPv4 IPsec testing \|
+| | Configure path for IPSec test
 | | Set Interface Address | ${dut_node} | ${dut_if} | ${dut_if_ip4}
 | | ...                   | ${ip4_plen}
 | | Set Interface Address | ${dut_node} | ${dut_lo} | ${dut_lo_ip4}
@@ -106,7 +106,7 @@
 | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip4}
 | | Set Test Variable | ${tg_src_ip} | ${tg_lo_ip4}
 
-| Setup Topology for IPv6 IPsec testing
+| Configure topology for IPv6 IPsec testing
 | | [Documentation] | Setup topology fo IPv6 IPsec testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variable:
@@ -116,8 +116,8 @@
 | | ... | - tg_src_ip - TG source IP address. Type: string
 | | ...
 | | ... | *Example:*
-| | ... | \| Setup Topology for IPv6 IPsec testing \|
-| | Setup Path for IPsec testing
+| | ... | \| Configure topology for IPv6 IPsec testing \|
+| | Configure path for IPSec test
 | | VPP Set If IPv6 Addr | ${dut_node} | ${dut_if} | ${dut_if_ip6} | ${ip6_plen}
 | | VPP Set If IPv6 Addr | ${dut_node} | ${dut_lo} | ${dut_lo_ip6} | ${ip6_plen}
 | | Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip6} | ${tg_if_mac}
@@ -129,7 +129,7 @@
 | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip6}
 | | Set Test Variable | ${tg_src_ip} | ${tg_lo_ip6}
 
-| VPP Setup IPsec Manual Keyed Connection
+| Configure manual keyed connection for IPSec
 | | [Documentation] | Setup IPsec manual keyed connection on VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -153,7 +153,7 @@
 | | ... | *Example:*
 | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
 | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
-| | ... | \| VPP Setup IPsec Manual Keyed Connection \| ${nodes['DUT1']} \
+| | ... | \| Configure manual keyed connection for IPSec \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| ${encr_alg} \| sixteenbytes_key \
 | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1000} \| ${1001} \
 | | ... | \| 192.168.4.4 \| 192.168.3.3 \| 192.168.100.3 \| 192.168.100.2 \|
@@ -186,7 +186,7 @@
 | | ...                     | sa_id=${l_sa_id} | laddr_range=${l_ip}
 | | ...                     | raddr_range=${r_ip} | inbound=${FALSE}
 
-| VPP Update IPsec SA Keys
+| Update IPSec SA keys
 | | [Documentation] | Update IPsec SA keys on VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -197,7 +197,7 @@
 | | ... | - integ_key - Integrity key. Type: string
 | | ...
 | | ... | *Example:*
-| | ... | \| VPP Update IPsec SA Keys \| ${nodes['DUT1']} \
+| | ... | \| Update IPSec SA keys \| ${nodes['DUT1']} \
 | | ... | \| 10 \| 20 \| sixteenbytes_key \| twentybytessecretkey \|
 | | [Arguments] | ${node} | ${l_sa_id} | ${r_sa_id} | ${crypto_key}
 | | ...         | ${integ_key}
@@ -206,7 +206,7 @@
 | | VPP IPsec SA Set Key | ${dut_node} | ${r_sa_id} | ${crypto_key}
 | | ...                  | ${integ_key}
 
-| Send and Receive IPsec Packet
+| Send IPsec Packet and verify ESP encapsulation in received packet
 | | [Documentation] | Send IPsec packet from TG to DUT. Receive IPsec packet\
 | | ...             | from DUT on TG and verify ESP encapsulation.
 | | ...
@@ -228,7 +228,7 @@
 | | ... | *Example:*
 | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \|
 | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \|
-| | ... | \| Send and Receive IPsec Packet \| ${nodes['TG']} \| eth1 \
+| | ... | \| Send IPsec Packet and verify ESP encapsulation in received packet \| ${nodes['TG']} \| eth1 \
 | | ... | \| 52:54:00:d4:d8:22 \| ${encr_alg} \| sixteenbytes_key \
 | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1001} \| ${1000} \
 | | ... | \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \| 192.168.100.3 \|
diff --git a/resources/libraries/robot/ipv4.robot b/resources/libraries/robot/ipv4.robot
index d279892ec3..d200afdea2 100644
--- a/resources/libraries/robot/ipv4.robot
+++ b/resources/libraries/robot/ipv4.robot
@@ -23,14 +23,14 @@
 
 *** Keywords ***
 
-| Setup IPv4 adresses on all DUT nodes in topology
+| Configure IPv4 addresses on all DUTs
 | | [Documentation] | Setup IPv4 address on all DUTs in topology
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | ${interfaces}= | VPP nodes set ipv4 addresses | ${nodes} | ${nodes_addr}
 | | :FOR | ${interface} | IN | @{interfaces}
 | | | Set Interface State | @{interface} | up | if_type=name
 
-| Routes are set up for IPv4 testing
+| Configure routes for IPv4 test
 | | [Documentation] | Setup routing on all VPP nodes required for IPv4 tests
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | Append Nodes | ${nodes['DUT1']} | ${nodes['DUT2']}
@@ -51,16 +51,16 @@
 | | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
 | | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr} | ${dut1_if}
 
-| Setup DUT nodes for IPv4 testing
-| | Setup IPv4 adresses on all DUT nodes in topology | ${nodes} | ${nodes_ipv4_addr}
+| Configure DUT nodes for IPv4 testing
+| | Configure IPv4 addresses on all DUTs | ${nodes} | ${nodes_ipv4_addr}
 | | Setup ARP on all DUTs | ${nodes} | ${nodes_ipv4_addr}
-| | Routes are set up for IPv4 testing | ${nodes} | ${nodes_ipv4_addr}
+| | Configure routes for IPv4 test | ${nodes} | ${nodes_ipv4_addr}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
 | TG interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4
 | | Node "${nodes['TG']}" interface "${tg_port}" can route to node "${node}" interface "${port}" "${hops}" hops away using IPv4
 
-| Node "${from_node}" interface "${from_port}" can route to node "${to_node}" interface "${to_port}" ${hops} hops away using IPv4
+| Route traffic from interface '${from_port}' on node '${from_node}' to interface '${to_port}' on node '${to_node}' '${hops}' hops away using IPv4
 | | ${src_ip}= | Get IPv4 address of node "${from_node}" interface "${from_port}" from "${nodes_ipv4_addr}"
 | | ${dst_ip}= | Get IPv4 address of node "${to_node}" interface "${to_port}" from "${nodes_ipv4_addr}"
 | | ${src_mac}= | Get interface mac | ${from_node} | ${from_port}
@@ -76,7 +76,7 @@
 | |          | ...      | --is_dst_tg ${is_dst_tg}
 | | Run Traffic Script On Node | ipv4_ping_ttl_check.py | ${from_node} | ${args}
 
-| Ipv4 icmp echo sweep
+| Execute IPv4 ICMP echo sweep
 | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT
 | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size} | ${step}
 | | Append Nodes | ${src_node} | ${dst_node}
@@ -95,7 +95,7 @@
 | | Run Traffic Script On Node | ipv4_sweep_ping.py | ${src_node} | ${args}
 | | ... | timeout=${180}
 
-| Send ARP request and validate response
+| Send ARP request and verify response
 | | [Arguments] | ${tg_node} | ${vpp_node}
 | | ${link_name}= | Get first active connecting link between node "${tg_node}" and "${vpp_node}"
 | | ${src_if}= | Get interface by link name | ${tg_node} | ${link_name}
@@ -109,7 +109,7 @@
 | |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args}
 
-| IP addresses are set on interfaces
+| Configure IP addresses on interfaces
 | | [Documentation] | Iterates through @{args} list and Set Interface Address
 | | ...             | for every (${dut_node}, ${interface}, ${address},
 | | ...             | ${prefix}) tuple.
@@ -123,7 +123,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| IP addresses are set on interfaces \
+| | ... | \| Configure IP addresses on interfaces \
 | | ... | \| ${dut1_node} \| ${dut1_to_dut2} \| 192.168.1.1 \| 24 \|
 | | ... | \| ... \| ${dut1_node} \| ${dut1_to_tg}   \| 192.168.2.1 \| 24 \|
 | | ...
@@ -132,7 +132,7 @@
 | | | Set Interface Address | ${dut_node} | ${interface} | ${address}
 | | | ... | ${prefix}
 
-| Node replies to ICMP echo request
+| Send ICMP echo request and verify answer
 | | [Documentation] | Run traffic script that waits for ICMP reply and ignores
 | | ...             | all other packets.
 | | ...
@@ -148,7 +148,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Node replies to ICMP echo request \
+| | ... | \| Send ICMP echo request and verify answer \
 | | ... | \| ${nodes['TG']} \| eth2 \
 | | ... | \| 08:00:27:46:2b:4c \| 08:00:27:66:b8:57 \
 | | ... | \| 192.168.23.10 \| 192.168.23.1 \| 10 \|
diff --git a/resources/libraries/robot/ipv6.robot b/resources/libraries/robot/ipv6.robot
index c6bf2922cb..35905af02a 100644
--- a/resources/libraries/robot/ipv6.robot
+++ b/resources/libraries/robot/ipv6.robot
@@ -26,7 +26,7 @@
 | Documentation | IPv6 keywords
 
 *** Keywords ***
-| Ipv6 icmp echo
+| Send IPv6 icmp echo request to DUT1 ingress inteface and verify answer
 | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT
 | | [Arguments] | ${tg_node} | ${dut_node} | ${nodes_addr}
 | | Append Nodes | ${tg_node} | ${dut_node}
@@ -41,11 +41,11 @@
 | | ${args}= | Traffic Script Gen Arg | ${src_port_name} | ${src_port_name} | ${src_mac}
 | |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args}
-| | Vpp dump stats | ${dst_node}
-| | ${ipv6_counter}= | Vpp get interface ipv6 counter | ${dst_node} | ${dst_port}
+| | Get interface statistics | ${dst_node}
+| | ${ipv6_counter}= | Get interface ipv6 counter | ${dst_node} | ${dst_port}
 | | Should Be Equal | ${ipv6_counter} | ${2} | #ICMPv6 neighbor advertisement + ICMPv6 echo request
 
-| Ipv6 icmp echo sweep
+| Execute IPv6 ICMP echo sweep
 | | [Documentation] | Type of the src_node must be TG and dst_node must be DUT
 | | [Arguments] | ${src_node} | ${dst_node} | ${start_size} | ${end_size}
 | | ...         | ${step} | ${nodes_addr}
@@ -67,7 +67,7 @@
 | | Run Traffic Script On Node | ipv6_sweep_ping.py | ${src_node} | ${args}
 | | ... | timeout=${180}
 
-| Ipv6 tg to dut1 egress
+| Send IPv6 ICMP echo request to DUT1 egress interface and verify answer
 | | [Documentation] | Send traffic from TG to first DUT egress interface
 | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr}
 | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut}
@@ -85,7 +85,7 @@
 | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args}
 
 
-| Ipv6 tg to dut2 via dut1
+| Send IPv6 ICMP echo request to DUT2 via DUT1 and verify answer
 | | [Documentation] | Send traffic from TG to second DUT through first DUT
 | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr}
 | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut}
@@ -102,7 +102,7 @@
 | |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Traffic Script On Node | icmpv6_echo.py | ${tg_node} | ${args}
 
-| Ipv6 tg to dut2 egress via dut1
+| Send IPv6 ICMP echo request to DUT2 egress interface via DUT1 and verify answer
 | | [Documentation] | Send traffic from TG to second DUT egress interface through first DUT
 | | [Arguments] | ${tg_node} | ${first_dut} | ${second_dut} | ${nodes_addr}
 | | Append Nodes | ${tg_node} | ${first_dut} | ${second_dut} | ${tg_node}
@@ -143,7 +143,7 @@
 | |          | ...      | --dst_nh_mac ${dst_nh_mac} | --h_num 2
 | | Run Traffic Script On Node | icmpv6_echo_req_resp.py | ${tg_node} | ${args}
 
-| Ipv6 neighbor solicitation
+| Send IPv6 neighbor solicitation and verify answer
 | | [Documentation] | Send IPv6 neighbor solicitation from TG to DUT
 | | [Arguments] | ${tg_node} | ${dut_node} | ${nodes_addr}
 | | Append Nodes | ${tg_node} | ${dut_node}
@@ -159,10 +159,10 @@
 | |          | ...                    | ${dst_mac} | ${src_ip} | ${dst_ip}
 | | Run Traffic Script On Node | ipv6_ns.py | ${src_node} | ${args}
 
-| Setup ipv6 to all dut in topology
+| Configure IPv6 on all DUTs in topology
 | | [Documentation] | Setup IPv6 address on all DUTs
 | | [Arguments] | ${nodes} | ${nodes_addr}
-| | Setup all DUTs before test
+| | Configure all DUTs before test
 | | ${interfaces}= | Nodes Set Ipv6 Addresses | ${nodes} | ${nodes_addr}
 | | :FOR | ${interface} | IN | @{interfaces}
 | | | Set Interface State | @{interface} | up | if_type=name
@@ -173,12 +173,12 @@
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | Nodes Clear Ipv6 Addresses | ${nodes} | ${nodes_addr}
 
-| Vpp nodes ra suppress link layer
+| Suppress ICMPv6 router advertisement message
 | | [Documentation] | Suppress ICMPv6 router advertisement message for link scope address
 | | [Arguments] | ${nodes}
 | | Vpp All Ra Suppress Link Layer | ${nodes}
 
-| Vpp nodes setup ipv6 routing
+| Configure IPv6 routing on all DUTs
 | | [Documentation] | Setup routing on all VPP nodes required for IPv6 tests
 | | [Arguments] | ${nodes} | ${nodes_addr}
 | | Append Nodes | ${nodes['DUT1']} | ${nodes['DUT2']}
diff --git a/resources/libraries/robot/l2_traffic.robot b/resources/libraries/robot/l2_traffic.robot
index b2653165d6..75ba532975 100644
--- a/resources/libraries/robot/l2_traffic.robot
+++ b/resources/libraries/robot/l2_traffic.robot
@@ -18,7 +18,7 @@
 | Library | resources.libraries.python.TrafficScriptExecutor
 
 *** Keywords ***
-| Send and receive ICMP Packet
+| Send ICMP packet and verify received packet
 | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to \
 | | ...             | destination interface. Packet can be set with Dot1q or
 | | ...             | Dot1ad tag(s) when required.
@@ -46,15 +46,15 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \
 | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=100 \|
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \
 | | ... | \| ${tg_to_dut2} \| encaps=Dot1ad \| vlan1=110 \| vlan2=220 \|
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \
 | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \| encaps_rx=Dot1q \|
-| | ... | \| Send and receive ICMP Packet \| ${nodes['TG']} \| ${tg_to_dut1} \
+| | ... | \| Send ICMP packet and verify received packet \| ${nodes['TG']} \| ${tg_to_dut1} \
 | | ... | \| ${tg_to_dut2} \| encaps=Dot1q \| vlan1=110 \| encaps_rx=Dot1q \
 | | ... | \| vlan1_rx=120 \|
 | | ...
@@ -85,7 +85,7 @@
 | | ... | ELSE | Catenate | ${args} | --vlan2_rx ${vlan2_rx}
 | | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Send and receive ICMP Packet should fail
+| ICMP packet transmission should fail
 | | [Documentation] | Send ICMPv4/ICMPv6 echo request from source interface to
 | | ...             | destination interface and expect failure with
 | | ...             | ICMP echo Rx timeout error message.
@@ -106,7 +106,7 @@
 | | ...
 | | ... | _NOTE:_ Default IP is IPv4
 | | ...
-| | ... | \| Send and receive ICMP Packet should fail\| ${nodes['TG']} \
+| | ... | \| ICMP packet transmission should fail\| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${src_int} | ${dst_int} |
@@ -120,7 +120,7 @@
 | | Run Keyword And Expect Error | ICMP echo Rx timeout |
 | | ... | Run Traffic Script On Node | send_ip_icmp.py | ${tg_node} | ${args}
 
-| Send and receive ICMPv4 bidirectionally
+| Send ICMPv4 bidirectionally and verify received packets
 | | [Documentation] | Send ICMPv4 echo request from both directions,
 | | ...             | from interface1 to interface2 and
 | | ...             | from interface2 to interface1.
@@ -139,17 +139,17 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send and receive ICMPv4 bidirectionally \| ${nodes['TG']} \
+| | ... | \| Send ICMPv4 bidirectionally and verify received packets \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=192.168.100.1 |
 | | ... | ${dst_ip}=192.168.100.2
-| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} |
+| | Send ICMP packet and verify received packet | ${tg_node} | ${int1} | ${int2} |
 | | ... | ${src_ip} | ${dst_ip}
-| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} |
+| | Send ICMP packet and verify received packet | ${tg_node} | ${int2} | ${int1} |
 | | ... | ${dst_ip} | ${src_ip}
 
-| Send and receive ICMPv6 bidirectionally
+| Send ICMPv6 bidirectionally and verify received packets
 | | [Documentation] | Send ICMPv6 echo request from both directions,
 | | ...             | from interface1 to interface2 and
 | | ...             | from interface2 to interface1.
@@ -168,12 +168,12 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send and receive ICMPv6 bidirectionally \| ${nodes['TG']} \
+| | ... | \| Send ICMPv6 bidirectionally and verify received packets \| ${nodes['TG']} \
 | | ... | \| ${tg_to_dut_if1} \| ${tg_to_dut_if2} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${int1} | ${int2} | ${src_ip}=3ffe:63::1 |
 | | ... | ${dst_ip}=3ffe:63::2
-| | Send and receive ICMP Packet | ${tg_node} | ${int1} | ${int2} |
+| | Send ICMP packet and verify received packet | ${tg_node} | ${int1} | ${int2} |
 | | ... | ${src_ip} | ${dst_ip}
-| | Send and receive ICMP Packet | ${tg_node} | ${int2} | ${int1} |
+| | Send ICMP packet and verify received packet | ${tg_node} | ${int2} | ${int1} |
 | | ... | ${dst_ip} | ${src_ip}
diff --git a/resources/libraries/robot/l2_xconnect.robot b/resources/libraries/robot/l2_xconnect.robot
index 4266234e10..00d33e867a 100644
--- a/resources/libraries/robot/l2_xconnect.robot
+++ b/resources/libraries/robot/l2_xconnect.robot
@@ -16,7 +16,7 @@
 | Library | resources.libraries.python.InterfaceUtil
 
 *** Keywords ***
-| L2 setup xconnect on DUT
+| Configure L2XC
 | | [Documentation] | Setup Bidirectional Cross Connect on DUTs
 | | [Arguments] | ${node} | ${if1} | ${if2} |
 | | Set Interface State | ${node} | ${if1} | up
diff --git a/resources/libraries/robot/lisp/l2lisp.robot b/resources/libraries/robot/lisp/l2lisp.robot
index c393493fa2..3e908a2378 100644
--- a/resources/libraries/robot/lisp/l2lisp.robot
+++ b/resources/libraries/robot/lisp/l2lisp.robot
@@ -24,7 +24,7 @@
 | Library  | resources.libraries.python.LispSetup.LispEidTableMap
 
 *** Keywords ***
-| Set up L2 Lisp on DUT
+| Configure L2 LISP on DUT
 | | [Documentation] | Set up LISP L2 topology.
 | | ...
 | | ... | *Arguments:*
@@ -36,7 +36,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Set up LISP GPE topology \| ${dut_node} \| ${adjacency} \
+| | ... | \| Configure LISP GPE topology in 3-node circular topology \| ${dut_node} \| ${adjacency} \
 | | ... | \| ${settings} \|
 | | ...
 | | [Arguments]
diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot
index a8b59e0fee..1f431245be 100644
--- a/resources/libraries/robot/lisp/lisp_api.robot
+++ b/resources/libraries/robot/lisp/lisp_api.robot
@@ -21,14 +21,14 @@
 
 *** Keywords ***
 
-| Lisp locator_set data is prepared
+| Generate LISP locator_set data
 | | [Documentation] | Generate lisp locator_set data for test
-| | ...             | the lisp locator_set and locator API.
+| | ... | the lisp locator_set and locator API.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - locator_set_number - Number how many locator_set data
-| | ... |                        will be generated. Type: integer
+| | ... | will be generated. Type: integer
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -39,7 +39,7 @@
 | | ... | from VAT.
 | | ...
 | | ... | *Example:*
-| | ... | \| Given Lisp locator_set data is prepared \| ${nodes['DUT1']} \
+| | ... | \| Given Generate LISP locator_set data \| ${nodes['DUT1']} \
 | | ... | \| ${locator_set_number} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${locator_set_number}
@@ -49,7 +49,7 @@
 | | Set Test Variable | ${locator_set_values}
 | | Set Test Variable | ${locator_set_values_vat}
 
-| Lisp locator_set data is set
+| Configure LISP locator_set data
 | | [Documentation] | Set the lisp locator_set and locator on the VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -60,16 +60,15 @@
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
 | | ... | - locator_set_values - Generated locator_set data from
-| | ... |                        KW locator_set data is prepared,
-| | ... |                        which will be set on the VPP node.
+| | ... | KW locator_set data is prepared, which will be set on the VPP node.
 | | ...
 | | ... | *Example:*
-| | ... | \| When Lisp locator_set data is set \| ${nodes['DUT1']} \|
+| | ... | \| When Configure LISP locator_set data \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | Vpp Set Lisp Locator Set | ${dut_node} | ${locator_set_values}
 
-| Lisp locator_set is set correctly
+| LISP locator_set shpuld be configured correctly
 | | [Documentation] | Test if the locator_set is set correctly on the VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -83,14 +82,15 @@
 | | ... | KW locator_set data is prepared, which are expected from VPP via VAT.
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp locator_set is set correctly \| ${nodes['DUT1']} \|
+| | ... | \| Then LISP locator_set shpuld be configured correctly \
+| | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | local
 | | Lisp Locator S Should Be Equal
 | | ... | ${locator_set_values_vat} | ${show_locator_set}
 
-| Delete all lisp locator_set from VPP
+| Delete all LISP locator_set from VPP
 | | [Documentation] | Delete all lisp locator_set on the VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -101,17 +101,16 @@
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
 | | ... | - locator_set_values - Generated locator_set data from
-| | ... |                        KW locator_set data is prepared,
-| | ... |                        which was set on the VPP node.
+| | ... | KW locator_set data is prepared, which was set on the VPP node.
 | | ...
 | | ... | *Example:*
-| | ... | \| When Delete all lisp locator_set from VPP \
+| | ... | \| When Delete all LISP locator_set from VPP \
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | Vpp Unset Lisp Locator Set | ${dut_node} | ${locator_set_values}
 
-| Lisp locator_set should be unset
+| LISP locator_set should be unset
 | | [Documentation] | Test if all locator_set are unset from VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -121,7 +120,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp locator_set should be unset \| ${nodes['DUT1']} \|
+| | ... | \| Then LISP locator_set should be unset \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node} | ${EMPTY}
@@ -129,12 +128,12 @@
 
 | Lisp locator_set data use for test reset locator_set are prepared
 | | [Documentation] | Generate lisp special type of locator_set data.
-| | ...             | This data will be use for test reset locator_set.
+| | ... | This data will be use for test reset locator_set.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - locator_set_number - Number how many locator_set data
-| | ... |                        it will generate. Type: integer
+| | ... | it will generate. Type: integer
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -146,7 +145,7 @@
 | | ...
 | | ... | *Example:*
 | | ... | \| Given Lisp locator_set data use for test reset locator_set \
-| | ... |    are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \|
+| | ... | are prepared \| ${nodes['DUT1']} \| ${locator_set_number} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${locator_set_number}
 | | ${locator_set_values} | ${locator_set_values_vat}=
@@ -155,7 +154,7 @@
 | | Set Test Variable | ${locator_set_values}
 | | Set Test Variable | ${locator_set_values_vat}
 
-| Lisp eid address is set
+| Configure LISP eid address
 | | [Documentation] | Set the lisp eid address on the VPP node.
 | | ...
 | | ... | *Arguments:*
@@ -166,18 +165,19 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| When Lisp eid address is set \| ${nodes['DUT1']} \| ${eid_table} |\
+| | ... | \| When Configure LISP eid address \| ${nodes['DUT1']} \
+| | ... | \| ${eid_table} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_eid}
 | | Vpp Set Lisp Eid Table | ${dut_node} | ${set_eid}
 
-| Lisp eid address is set correctly to eid table
+| LISP eid address should be set correctly to eid table
 | | [Documentation] | Test if the locator_set is set correctly on the VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - set_eid - Example eid data, which was set to the VPP node.
-| | ... |                Type: list
+| | ... | Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -186,32 +186,32 @@
 | | ... | - set_eid - Generated eid data, which will be set to the VPP node.
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp eid address is set correctly to eid table \
+| | ... | \| Then LISP eid address should be set correctly to eid table \
 | | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_eid}
 | | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node}
 | | Lisp Should Be Equal | ${set_eid} | ${show_eid}
 
-| Delete all lisp eid address from VPP
+| Delete all LISP eid address from VPP
 | | [Documentation] | Delete all lisp eid address from the VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - set_eid - Eid data which will be removed from the VPP node.
-| | ... |             Type: list
+| | ... | Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| When Delete all lisp eid address from VPP \
+| | ... | \| When Delete all LISP eid address from VPP \
 | | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_eid}
 | | Vpp Unset Lisp Eid Table | ${dut_node} | ${set_eid}
 
-| Lisp eid table should be empty
+| LISP eid table should be empty
 | | [Documentation] | Test if the eid table is empty.
 | | ...
 | | ... | *Arguments:*
@@ -221,69 +221,69 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp eid table should be empty \| ${nodes['DUT1']} \|
+| | ... | \| Then LISP eid table should be empty \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | ${show_eid}= | Vpp Show Lisp Eid Table | ${dut_node}
 | | Lisp Is Empty | ${show_eid}
 
-| Lisp map resolver address is set
+| Configure LISP map resolver address
 | | [Documentation] | Set the lisp map resolver address in the VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - set_map_resolver - Map resolver data, which will be set on
-| | ... |                      the VPP node. Type: list
+| | ... | the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| When Lisp map resolver address is set \| ${nodes['DUT1']} \
+| | ... | \| When Configure LISP map resolver address \| ${nodes['DUT1']} \
 | | ... | \| ${map_resolver} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | Vpp Set Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
 
-| Lisp map resolver address is set correctly
+| LISP map resolver address should be configured correctly
 | | [Documentation] | Test if the map resolver address is set correctly
-| | ...             | on the VPP node.
+| | ... | on the VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - set_map_resolver - Map resolver data, which was set on
-| | ... |                      the VPP node. Type: list
+| | ... | the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp map resolver address is set correctly \
+| | ... | \| Then LISP map resolver address should be configured correctly \
 | | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
 | | Lisp Should Be Equal | ${set_map_resolver} | ${show_map_resolver}
 
-| Delete all lisp map resolver address from VPP
+| Delete all LISP map resolver address from VPP
 | | [Documentation] | Delete all lisp map resolver address on the VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - map_resolver - Map resolver data, which will be remove from
-| | ... |                  the VPP. Type: list
+| | ... | the VPP. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| When Delete all lisp map resolver address from VPP \
+| | ... | \| When Delete all LISP map resolver address from VPP \
 | | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | Vpp Unset Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
 
-| Lip map resolver address should be empty
+| LISP map resolver address should be empty
 | | [Documentation] | Test if the map resolver are empty.
 | | ...
 | | ... | *Arguments:*
@@ -293,15 +293,15 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lip map resolver address should be empty \
+| | ... | \| Then LISP map resolver address should be empty \
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
 | | Lisp Is Empty | ${show_map_resolver}
 
-| Enable lisp
-| | [Documentation] | Enable lisp on VPP node.
+| Enable LISP
+| | [Documentation] | Enable LISP on VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
@@ -310,32 +310,32 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Enable lisp \| ${nodes['DUT1']} \|
+| | ... | \| Enable LISP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | Vpp Lisp Enable Disable | ${dut_node} | enable
 
-| Check if lisp is enabled
+| LISP should be enabled
 | | [Documentation] | Check if the lisp is enabled.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - lisp_status_data - Lisp status data, which was set on
-| | ... |                      the VPP node. Type: list
+| | ... | the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Check if lisp is enabled \| ${nodes['DUT1']} \
+| | ... | \| LISP should be enabled \| ${nodes['DUT1']} \
 | | ... | \| ${lisp_status_data} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${lisp_status_data}
 | | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node}
 | | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[1]}
 
-| Disable lisp
-| | [Documentation] | Disable lisp on VPP node.
+| Disable LISP
+| | [Documentation] | Disable LISP on VPP node.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
@@ -344,24 +344,24 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Disable lisp \| ${nodes['DUT1']} \|
+| | ... | \| Disable LISP \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | Vpp Lisp Enable Disable | ${dut_node} | disable
 
-| Check if lisp is disabled
-| | [Documentation] | Check if lisp is disabled.
+| LISP Should be disabled
+| | [Documentation] | LISP Should be disabled.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node. Type: dictionary
 | | ... | - lisp_status_data - Lisp status data, which was set on
-| | ... |                      the VPP node. Type: list
+| | ... | the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Check if lisp is disabled \| ${nodes['DUT1']} \
+| | ... | \| LISP Should be disabled \| ${nodes['DUT1']} \
 | | ... | \| ${lisp_status_data} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${lisp_status_data}
diff --git a/resources/libraries/robot/lisp/lisp_static_adjacency.robot b/resources/libraries/robot/lisp/lisp_static_adjacency.robot
index 0a4f438e5f..737c535ce8 100644
--- a/resources/libraries/robot/lisp/lisp_static_adjacency.robot
+++ b/resources/libraries/robot/lisp/lisp_static_adjacency.robot
@@ -22,7 +22,7 @@
 | Library  | resources.libraries.python.IPv4Util.IPv4Util
 
 *** Keywords ***
-| Set up Lisp topology
+| Configure LISP topology in 3-node circular topology
 | | [Documentation] | Set up Lisp static adjacency topology.
 | | ...
 | | ... | *Arguments:*
@@ -42,7 +42,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Set up Lisp topology \| ${dut1_node} \| ${interface_name} \
+| | ... | \| Configure LISP topology in 3-node circular topology \| ${dut1_node} \| ${interface_name} \
 | | ... | \| None \| ${dut2_node} \| ${interface_name} \| None \
 | | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \
 | | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \|
@@ -98,7 +98,7 @@
 | | ...                    | ${dut2_static_adjacency['seid']}
 | | ...                    | ${dut2_static_adjacency['prefix']}
 
-| Change Lisp Configuration
+| Change LISP Configuration
 | | [Documentation] | Change configuration of the Lisp protocol.
 | | ...
 | | ... | *Arguments:*
@@ -124,7 +124,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Change Lisp Configuration \| ${dut1_node} \| ${dut2_node} \
+| | ... | \| Change LISP Configuration \| ${dut1_node} \| ${dut2_node} \
 | | ... | \| ${dut1_to_dut2} \| ${dut2_to_dut1} | "08:00:27:20:e0:0d" \
 | | ... | \| "08:00:27:b1:94:b1" \| "6.3.0.1" \| "6.3.0.20" \| "24" \
 | | ... | \| ${old_dut1_static_adjacency} \| ${new_dut1_static_adjacency} \|
diff --git a/resources/libraries/robot/lisp/lispgpe.robot b/resources/libraries/robot/lisp/lispgpe.robot
index 7dc53c7e27..c39b64cf3f 100644
--- a/resources/libraries/robot/lisp/lispgpe.robot
+++ b/resources/libraries/robot/lisp/lispgpe.robot
@@ -23,8 +23,8 @@
 | Library  | resources.libraries.python.LispSetup.LispEidTableMap
 
 *** Keywords ***
-| Set up LISP GPE topology
-| | [Documentation] | Set up LISP GPE topology.
+| Configure LISP GPE topology in 3-node circular topology
+| | [Documentation] | Configure LISP GPE topology in 3-node circular topology.
 | | ...
 | | ... | *Arguments:*
 | | ... | - dut1_node - DUT1 node. Type: dictionary
@@ -43,7 +43,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Set up LISP GPE topology \| ${dut1_node} \| ${interface_name} \
+| | ... | \| Configure LISP GPE topology in 3-node circular topology \| ${dut1_node} \| ${interface_name} \
 | | ... | \| None \| ${dut2_node} \| ${interface_name} \| None \
 | | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \
 | | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \|
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index b8a0f08d9c..9435d82897 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -73,7 +73,7 @@
 | | ... | Return From Keyword | 353.83333
 | | Return From Keyword | ${framesize}
 
-| 2-node circular Topology Variables Setup
+| Set variables in 2-node circular topology
 | | [Documentation]
 | | ... | Compute path for testing on two given nodes in circular
 | | ... | topology and set corresponding suite variables.
@@ -99,7 +99,7 @@
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
 
-| 3-node circular Topology Variables Setup
+| Set variables in 3-node circular topology
 | | [Documentation]
 | | ... | Compute path for testing on three given nodes in circular
 | | ... | topology and set corresponding suite variables.
@@ -134,7 +134,7 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
-| 2-node circular Topology Variables Setup with DUT interface model
+| Set variables in 2-node circular topology with DUT interface model
 | | [Documentation]
 | | ... | Compute path for testing on two given nodes in circular topology
 | | ... | based on interface model provided as an argument and set
@@ -153,7 +153,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 2-node circular Topology Variables Setup with DUT interface model \
+| | ... | \| Set variables in 2-node circular topology with DUT interface model\
 | | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${iface_model}
@@ -174,7 +174,7 @@
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
 
-| 3-node circular Topology Variables Setup with DUT interface model
+| Set variables in 3-node circular topology with DUT interface model
 | | [Documentation]
 | | ... | Compute path for testing on three given nodes in circular topology
 | | ... | based on interface model provided as an argument and set
@@ -196,7 +196,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 3-node circular Topology Variables Setup with DUT interface model \
+| | ... | \| Set variables in 3-node circular topology with DUT interface model\
 | | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${iface_model}
@@ -223,7 +223,7 @@
 | | Set Suite Variable | ${dut2_if1}
 | | Set Suite Variable | ${dut2_if2}
 
-| VPP interfaces in path are up in a 2-node circular topology
+| Set interfaces in path in 2-node circular topology up
 | | [Documentation]
 | | ... | *Set UP state on VPP interfaces in path on nodes in 2-node circular
 | | ... | topology.*
@@ -232,7 +232,7 @@
 | | Set Interface State | ${dut1} | ${dut1_if2} | up
 | | Vpp Node Interfaces Ready Wait | ${dut1}
 
-| VPP interfaces in path are up in a 3-node circular topology
+| Set interfaces in path in 3-node circular topology up
 | | [Documentation]
 | | ... | *Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology.*
@@ -244,7 +244,7 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1}
 | | Vpp Node Interfaces Ready Wait | ${dut2}
 
-| IPsec initialized in a 3-node circular topology
+| Initialize IPSec in 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
@@ -255,7 +255,7 @@
 | | ...
 | | VPP Show Crypto Device Mapping | ${dut1}
 | | VPP Show Crypto Device Mapping | ${dut2}
-| | VPP interfaces in path are up in a 3-node circular topology
+| | Set interfaces in path in 3-node circular topology up
 | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if1_mac}= | Get Interface MAC | ${dut1} | ${dut1_if1}
@@ -272,14 +272,14 @@
 | | Set Test Variable | ${dut1_if2_mac}
 | | Set Test Variable | ${dut2_if1_mac}
 | | Set Test Variable | ${dut2_if2_mac}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | ${dut1_if1_ip4}
-| | ... | 24
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | ${dut1_if2_ip4}
-| | ... | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | ${dut2_if1_ip4}
-| | ... | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | ${dut2_if2_ip4}
-| | ... | 24
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
+| | ... | ${dut1_if1_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
+| | ... | ${dut1_if2_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
+| | ... | ${dut2_if1_ip4} | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
+| | ... | ${dut2_if2_ip4} | 24
 | | Add arp on dut | ${dut1} | ${dut1_if1} | ${tg_if1_ip4} | ${tg_if1_mac}
 | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_if1_ip4} | ${dut2_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac}
@@ -287,7 +287,7 @@
 | | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | ${tg_if1_ip4} | ${dut1_if1}
 | | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | ${tg_if2_ip4} | ${dut2_if2}
 
-| IPv4 forwarding initialized in a 3-node circular topology
+| Initialize IPv4 forwarding in 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
@@ -315,7 +315,7 @@
 | | dut2_v4.set_route | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| IPv4 forwarding initialized in a 2-node switched topology
+| Initialize IPv4 forwarding in 2-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular
 | | ... | topology. Get the interface MAC addresses and setup ARP on all VPP
@@ -333,7 +333,7 @@
 | | dut1_v4.set_ip | ${dut1_if2} | 20.20.20.2 | 24
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Scale IPv4 forwarding initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with scaling in 3-node circular topology
 | | [Documentation]
 | | ... | Custom setup of IPv4 topology with scalability of ip routes on all
 | | ... | DUT nodes in 3-node circular topology
@@ -346,8 +346,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Scale IPv4 forwarding initialized in a 3-node circular topology \
-| | ... | \| 100000 \|
+| | ... | \| Initialize IPv4 forwarding with scaling in 3-node circular \
+| | ... | topology \| 100000 \|
 | | ...
 | | [Arguments] | ${count}
 | | ...
@@ -363,10 +363,10 @@
 | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${dut1_if2_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if2} | 3.3.3.1 | ${tg1_if2_mac}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.2 | 30
 | | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | 1.1.1.1 | ${dut1_if1}
 | | ... | count=${count}
 | | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2}
@@ -377,7 +377,7 @@
 | | ... | count=${count}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| IPv4 forwarding with vhost initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with vhost in 3-node circular topology
 | | [Documentation]
 | | ... | Create vhost-user interfaces in VPP. Set UP state of all VPP
 | | ... | interfaces in path on nodes in 3-node circular topology. Create 2
@@ -402,14 +402,14 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Set interfaces in path in 3-node circular topology up
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
 | | ${dut1_vif1}= | Set Variable | ${vhost_if1}
 | | ${dut1_vif2}= | Set Variable | ${vhost_if2}
 | | Set Interface State | ${dut1} | ${dut1_vif1} | up
 | | Set Interface State | ${dut1} | ${dut1_vif2} | up
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
 | | ${dut2_vif1}= | Set Variable | ${vhost_if1}
 | | ${dut2_vif2}= | Set Variable | ${vhost_if2}
@@ -447,14 +447,14 @@
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_vif2} | ${fib_table_2}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif1} | 4.4.4.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_vif2} | 5.5.5.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif1} | 4.4.4.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_vif2} | 5.5.5.1 | 30
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -496,7 +496,7 @@
 | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 5.5.5.2 | ${dut2_vif2}
 | | ... | vrf=${fib_table_2}
 
-| IPv4 forwarding with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology
+| Initialize IPv4 forwarding with vhost for '${nr}' VMs in 3-node circular topology
 | | [Documentation]
 | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all
 | | ... | VPP nodes. Set UP state of all VPP interfaces in path. Create ${nr}+1
@@ -523,7 +523,7 @@
 | | ... | \| IPv4 forwarding with Vhost-User for '2' VMs initialized in \
 | | ... | a 3-node circular topology \|
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
+| | Set interfaces in path in 3-node circular topology up
 | | ${fib_table_1}= | Set Variable | ${101}
 | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nr}
 | | ${dut1_if1_idx}= | Get Interface SW Index | ${dut1} | ${dut1_if1}
@@ -542,10 +542,10 @@
 | | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1}
 | | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | 30
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 3.3.3.1 | 30
 | | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
@@ -574,7 +574,7 @@
 | |      | ... | ${ip_base_vif1}.${ip_base_vif1}.${ip_base_vif1}
 | |      | ${ip_net_vif2}= | Set Variable
 | |      | ... | ${ip_base_vif2}.${ip_base_vif2}.${ip_base_vif2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
 | |      | ... | dut1-vhost-${number}-if2
 | |      | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up
@@ -583,7 +583,7 @@
 | |      | ... | ${dut1-vhost-${number}-if1}
 | |      | ${dut1_vif2_idx}= | Get Interface SW Index | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | |      | ... | dut2-vhost-${number}-if2
 | |      | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if1} | up
@@ -608,7 +608,7 @@
 | |      | ... | ${fib_table_1}
 | |      | Assign Interface To Fib Table | ${dut2} | ${dut2-vhost-${number}-if2}
 | |      | ... | ${fib_table_2}
-| |      | IP addresses are set on interfaces
+| |      | Configure IP addresses on interfaces
 | |      | ... | ${dut1} | ${dut1-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30
 | |      | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${ip_net_vif2}.1 | 30
 | |      | ... | ${dut2} | ${dut2-vhost-${number}-if1} | ${ip_net_vif1}.1 | 30
@@ -648,7 +648,7 @@
 | |      | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | ${ip_net_vif2}.2
 | |      | ... | ${dut2-vhost-${number}-if2} | vrf=${fib_table_2}
 
-| IPv4 policer 2r3c-${t} initialized in a 3-node circular topology
+| Initialize IPv4 policer 2r3c-${t} in 3-node circular topology
 | | [Documentation]
 | | ... | Setup of 2r3c color-aware or color-blind policer with dst ip match
 | | ... | on all DUT nodes in 3-node circular topology. Policer is applied on
@@ -678,7 +678,7 @@
 | | Policer Classify Set Match IP | 10.10.10.2 | ${False}
 | | Policer Set Configuration
 
-| IPv6 forwarding initialized in a 3-node circular topology
+| Initialize IPv6 forwarding in 3-node circular topology
 | | [Documentation]
 | | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
 | | ... | topology. Get the interface MAC addresses and setup neighbour on all
@@ -695,7 +695,7 @@
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | 2001:3::1 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | 2001:2::1 | ${prefix}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac}
@@ -703,7 +703,7 @@
 | | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2}
 | | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1}
 
-| Scale IPv6 forwarding initialized in a 3-node circular topology
+| Initialize IPv6 forwarding with scaling in 3-node circular topology
 | | [Documentation]
 | | ... | Custom setup of IPv6 topology with scalability of ip routes on all
 | | ... | DUT nodes in 3-node circular topology
@@ -716,8 +716,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Scale IPv6 forwarding initialized in a 3-node circular topology \
-| | ... | \| 100000 \|
+| | ... | \| Initialize IPv6 forwarding with scaling in 3-node circular \
+| | ... | topology \| 100000 \|
 | | ...
 | | [Arguments] | ${count}
 | | ...
@@ -731,7 +731,7 @@
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:3::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:4::2 | ${dut2_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac}
@@ -745,7 +745,7 @@
 | | Vpp Route Add | ${dut2} | 2001:2::0 | ${host_prefix} | 2001:5::2
 | | ... | interface=${dut2_if2} | count=${count}
 
-| IPv6 iAcl whitelist initialized in a 3-node circular topology
+| Initialize IPv6 iAcl whitelist in 3-node circular topology
 | | [Documentation]
 | | ... | Creates classify L3 table on DUTs. IPv6 iAcl security whitelist
 | | ... | ingress /64 filter entries applied on links TG - DUT1 and DUT2 - TG.
@@ -765,16 +765,16 @@
 | | And Vpp Enable Input Acl Interface
 | | ... | ${dut2} | ${dut2_if2} | ip6 | ${table_idx}
 
-| L2 xconnect initialized in a 3-node circular topology
+| Initialize L2 xconnect in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology by cross connecting two interfaces on
 | | ... | each DUT. Interfaces are brought up.
 | | ... |
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure L2XC | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 xconnect with VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 xconnect with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology with VXLANoIPv4 by cross connecting
 | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
@@ -782,21 +782,21 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | interfaces.
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if1} | 172.16.0.1 | ${dut1_if2_mac}
 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
 | | ... | 172.16.0.1 | 172.16.0.2
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 
-| L2 xconnect with Vhost-User initialized in a 3-node circular topology
+| Initialize L2 xconnect with Vhost-User in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface.
@@ -812,17 +812,17 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if2} | ${vhost_if2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut1} | ${dut1_if2} | ${vhost_if2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if1} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | Configure L2XC | ${dut2} | ${dut2_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 xconnect with Vhost-User for '${nr}' initialized in a 3-node circular topology
+| Initialize L2 xconnect with Vhost-User for '${nr}' in 3-node circular topology
 | | [Documentation]
 | | ... | Create pairs of Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface or virtual
@@ -845,26 +845,26 @@
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
 | |      | ${prev_index}= | Evaluate | ${number}-1
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
 | |      | ... | dut1-vhost-${number}-if2
 | |      | ${dut1_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut1_if1}
 | |      | ... | ${dut1-vhost-${prev_index}-if2}
-| |      | L2 setup xconnect on DUT | ${dut1} | ${dut1_xconnect_if1}
+| |      | Configure L2XC | ${dut1} | ${dut1_xconnect_if1}
 | |      | ... | ${dut1-vhost-${number}-if1}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | |      | ... | dut2-vhost-${number}-if2
 | |      | ${dut2_xconnect_if1}= | Set Variable If | ${number}==1 | ${dut2_if1}
 | |      | ... | ${dut2-vhost-${prev_index}-if2}
-| |      | L2 setup xconnect on DUT | ${dut2} | ${dut2_xconnect_if1}
+| |      | Configure L2XC | ${dut2} | ${dut2_xconnect_if1}
 | |      | ... | ${dut2-vhost-${number}-if1}
-| |      | Run Keyword If | ${number}==${nr} | L2 setup xconnect on DUT
+| |      | Run Keyword If | ${number}==${nr} | Configure L2XC
 | |      | ... | ${dut1} | ${dut1-vhost-${number}-if2} | ${dut1_if2}
-| |      | Run Keyword If | ${number}==${nr} | L2 setup xconnect on DUT
+| |      | Run Keyword If | ${number}==${nr} | Configure L2XC
 | |      | ... | ${dut2} | ${dut2-vhost-${number}-if2} | ${dut2_if2}
 
-| L2 xconnect with Vhost-User and VLAN initialized in a 3-node circular topology
+| Initialize L2 xconnect with Vhost-User and VLAN in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Cross
 | | ... | connect each Vhost interface with one physical interface.
@@ -883,33 +883,33 @@
 | | ...
 | | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | Set interfaces in path in 3-node circular topology up
+| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | L2 tag rewrite method setup on interfaces
+| | Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut1} | ${dut1_if1} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut1} | ${subif_index_1} | ${vhost_if2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1}
+| | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | L2 setup xconnect on DUT | ${dut2} | ${subif_index_2} | ${vhost_if1}
-| | L2 setup xconnect on DUT | ${dut2} | ${dut2_if2} | ${vhost_if2}
+| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1}
+| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domain initialized in a 3-node circular topology
+| Initialize L2 bridge domain in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 DB topology by adding two interfaces on each DUT into BD
 | | ... | that is created automatically with index 1. Learning is enabled.
 | | ... | Interfaces are brought up.
 | | ...
-| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if1} | ${dut2_if2}
+| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure L2BD forwarding | ${dut2} | ${dut2_if1} | ${dut2_if2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -928,21 +928,21 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User for '${nr}' VMs initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User for '${nr}' VMs in 3-node circular topology
 | | [Documentation]
 | | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all
 | | ... | defined VPP nodes. Add each Vhost-User interface into L2 bridge
@@ -963,30 +963,30 @@
 | | ... | a 3-node circular topology \|
 | | ...
 | | ${bd_id2}= | Evaluate | ${nr}+1
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${1}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if1} | ${1}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${1}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | |      | ... | ${sock1} | ${sock2} | dut1-vhost-${number}-if1
 | |      | ... | dut1-vhost-${number}-if2
 | |      | ${bd_id2}= | Evaluate | ${number}+1
-| |      | Interface is added to bridge domain | ${dut1}
+| |      | Add interface to bridge domain | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if1} | ${number}
-| |      | Interface is added to bridge domain | ${dut1}
+| |      | Add interface to bridge domain | ${dut1}
 | |      | ... | ${dut1-vhost-${number}-if2} | ${bd_id2}
-| |      | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| |      | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | |      | ... | ${sock1} | ${sock2} | dut2-vhost-${number}-if1
 | |      | ... | dut2-vhost-${number}-if2
-| |      | Interface is added to bridge domain | ${dut2}
+| |      | Add interface to bridge domain | ${dut2}
 | |      | ... | ${dut2-vhost-${number}-if1} | ${number}
-| |      | Interface is added to bridge domain | ${dut2}
+| |      | Add interface to bridge domain | ${dut2}
 | |      | ... | ${dut2-vhost-${number}-if2} | ${bd_id2}
 
-| L2 bridge domain with VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Setup L2 bridge domain topology with VXLANoIPv4 by connecting
 | | ... | physical and vxlan interfaces on each DUT. All interfaces are brought
@@ -994,9 +994,9 @@
 | | ... | between DUTs. VXLAN sub-interfaces has same IPv4 address as
 | | ... | interfaces.
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | Add arp on dut | ${dut1} | ${dut1_if2} | 172.16.0.2 | ${dut2_if1_mac}
@@ -1005,11 +1005,11 @@
 | | ... | 172.16.0.1 | 172.16.0.2
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | Vpp l2bd forwarding setup | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
-| | Vpp l2bd forwarding setup | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
+| | Configure L2BD forwarding | ${dut1} | ${dut1_if1} | ${dut1s_vxlan}
+| | Configure L2BD forwarding | ${dut2} | ${dut2_if2} | ${dut2s_vxlan}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User and VXLANoIPv4 in 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -1032,28 +1032,28 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
+| | Set interfaces in path in 3-node circular topology up
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | 24
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 | 24
 | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24
 | | ... | 172.16.0.1 | 172.16.0.2
 | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24
 | | ... | 172.16.0.2 | 172.16.0.1
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${dut1s_vxlan} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User initialized in a 2-node circular topology
+| Initialize L2 bridge domains with Vhost-User in 2-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -1072,15 +1072,15 @@
 | | ...
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2}
 | | ...
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| L2 bridge domains with Vhost-User and VLAN initialized in a 3-node circular topology
+| Initialize L2 bridge domains with Vhost-User and VLAN in a 3-node circular topology
 | | [Documentation]
 | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Add each
 | | ... | Vhost-User interface into L2 bridge domains with learning enabled
@@ -1104,27 +1104,27 @@
 | | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid}
 | | ... | ${tag_rewrite}
 | | ...
-| | VPP interfaces in path are up in a 3-node circular topology
-| | VLAN dot1q subinterfaces initialized on 3-node topology
+| | Set interfaces in path in 3-node circular topology up
+| | Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid}
-| | L2 tag rewrite method setup on interfaces
+| | Configure L2 tag rewrite method on interfaces
 | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2}
 | | ... | ${tag_rewrite}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut1}
+| | Configure vhost interfaces for L2BD forwarding | ${dut1}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
-| | VPP Vhost interfaces for L2BD forwarding are setup | ${dut2}
+| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2}
+| | Configure vhost interfaces for L2BD forwarding | ${dut2}
 | | ... | ${sock1} | ${sock2}
-| | Interface is added to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
-| | Interface is added to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
-| | Interface is added to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1}
+| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2}
+| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| 2-node Performance Suite Setup with DUT's NIC model
+| Set up 2-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1142,12 +1142,12 @@
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
 | | Show vpp version on all DUTs
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 
-| 2-node-switched Performance Suite Setup with DUT's NIC model
+| Set up 2-node-switched performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1169,13 +1169,13 @@
 | | ... | ${tg_if2_dest_mac}
 | | ...
 | | Show vpp version on all DUTs
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 | | ... | ${tg_if1_dest_mac} | ${tg_if2_dest_mac}
 
-| 3-node Performance Suite Setup with DUT's NIC model
+| Set up 3-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Suite preparation phase that setup default startup configuration of
 | | ... | VPP on all DUTs. Updates interfaces on all nodes and setup global
@@ -1188,23 +1188,24 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| 3-node Performance Suite Setup \| L2 \| Intel-X520-DA2 \|
+| | ... | \| Set up 3-node performance topology with DUT's NIC model \| L2 \
+| | ... | \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
 | | Show vpp version on all DUTs
-| | 3-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 3-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type}
 
-| 3-node Performance Suite Teardown
+| Tear down 3-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ...
 | | Teardown traffic generator | ${tg}
 
-| 2-node Performance Suite Teardown
+| Tear down 2-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ...
@@ -1576,7 +1577,7 @@
 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type}
 | | ...
 | | Return From Keyword If | ${rate} <= 10000 | ${-1}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is DPDK performance test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate}pps | ${framesize}
 | | ... | ${topology_type} | warmup_time=0
@@ -1606,7 +1607,7 @@
 | | ...
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ... | ${rate} | ${framesize} | ${topology_type}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is DPDK performance test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate} | ${framesize}
 | | ... | ${topology_type} | warmup_time=0
@@ -1637,7 +1638,7 @@
 | | ...
 | | Clear and show runtime counters with running traffic | ${duration}
 | | ... | ${rate} | ${framesize} | ${topology_type}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is DPDK performance test
 | | Run Keyword If | ${ret}==${FALSE} | Clear all counters on all DUTs
 | | Send traffic on tg | ${duration} | ${rate} | ${framesize}
 | | ... | ${topology_type} | warmup_time=0
@@ -1666,13 +1667,13 @@
 | | ...
 | | Send traffic on tg | -1 | ${rate} | ${framesize} | ${topology_type}
 | | ... | warmup_time=0 | async_call=${True} | latency=${False}
-| | ${ret}= | For DPDK Performance Test
+| | ${ret}= | Is DPDK performance test
 | | Run Keyword If | ${ret}==${FALSE} | Clear runtime counters on all DUTs
 | | Sleep | ${duration}
 | | Run Keyword If | ${ret}==${FALSE} | Show runtime counters on all DUTs
 | | Stop traffic on tg
 
-| Add PCI devices to DUTs from 3-node single link topology
+| Add PCI devices to DUTs in 3-node single link topology
 | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
 | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_pci}= | Get Interface PCI Addr | ${dut2} | ${dut2_if1}
@@ -1680,12 +1681,12 @@
 | | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci}
 | | Add PCI device | ${dut2} | ${dut2_if1_pci} | ${dut2_if2_pci}
 
-| Add PCI devices to DUTs from 2-node single link topology
+| Add PCI devices to DUTs in 2-node single link topology
 | | ${dut1_if1_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if1}
 | | ${dut1_if2_pci}= | Get Interface PCI Addr | ${dut1} | ${dut1_if2}
 | | Add PCI device | ${dut1} | ${dut1_if1_pci} | ${dut1_if2_pci}
 
-| Guest VM with dpdk-testpmd connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1706,10 +1707,10 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
-| | ... | \| Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \
 | | ... | \| qemu_id=${2} \|
 | | ...
@@ -1742,7 +1743,7 @@
 | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| '${nr}' Guest VMs with dpdk-testpmd connected via vhost-user is setup in a 3-node circular topology
+| Configure '${nr}' guest VMs with dpdk-testpmd connected via vhost-user in 3-node circular topology
 | | [Documentation]
 | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd for defined number of VMs on all defined VPP nodes.
@@ -1757,23 +1758,23 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| '2' Guest VM with dpdk-testpmd connected via vhost-user is setup \
+| | ... | \| '2' Configure guest VM with dpdk-testpmd connected via vhost-user \
 | | ... | in a 3-node circular topology \|
 | | ...
 | | :FOR | ${number} | IN RANGE | 1 | ${nr}+1
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
 | |      | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
-| |      | ${vm1}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| |      | ${vm1}= | Configure guest VM with dpdk-testpmd connected via vhost-user
 | |      | ...     | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number}
 | |      | ...     | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1}
-| |      | ${vm2}= | Guest VM with dpdk-testpmd connected via vhost-user is setup
+| |      | ${vm2}= | Configure guest VM with dpdk-testpmd connected via vhost-user
 | |      | ...     | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number}
 | |      | ...     | skip=${skip_cpus} | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2}
 
-| Guest VM with dpdk-testpmd using SMT connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1819,7 +1820,7 @@
 | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1881,7 +1882,7 @@
 | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| '${nr}' Guest VMs with dpdk-testpmd-mac connected via vhost-user is setup in a 3-node circular topology
+| Configure '${nr}' guest VMs with dpdk-testpmd-mac connected via vhost-user in 3-node circular topology
 | | [Documentation]
 | | ... | Start QEMU guests with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd with fwd mode set to mac rewrite for defined number of
@@ -1904,20 +1905,20 @@
 | |      | ${sock1}= | Set Variable | /tmp/sock-${number}-1
 | |      | ${sock2}= | Set Variable | /tmp/sock-${number}-2
 | |      | ${skip_cpus}= | Evaluate | ${vpp_cpus}+${system_cpus}
-| |      | ${vm1}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| |      | ${vm1}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | |      | ... | ${dut1} | ${sock1} | ${sock2} | DUT1_VM${number}
 | |      | ... | ${dut1-vhost-${number}-if1_mac}
 | |      | ... | ${dut1-vhost-${number}-if2_mac} | skip=${skip_cpus}
 | |      | ... | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut1_vm_refs} | DUT1_VM${number} | ${vm1}
-| |      | ${vm2}= | Guest VM with dpdk-testpmd-mac connected via vhost-user is setup
+| |      | ${vm2}= | Configure guest VM with dpdk-testpmd-mac connected via vhost-user
 | |      | ... | ${dut2} | ${sock1} | ${sock2} | DUT2_VM${number}
 | |      | ... | ${dut2-vhost-${number}-if1_mac}
 | |      | ... | ${dut2-vhost-${number}-if2_mac} | skip=${skip_cpus}
 | |      | ... | count=${vm_cpus} | qemu_id=${number}
 | |      | Set To Dictionary | ${dut2_vm_refs} | DUT2_VM${number} | ${vm2}
 
-| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user is setup
+| Configure guest VM with dpdk-testpmd-mac using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | DPDK testpmd. Qemu Guest uses by default 5 cores and 2048M. Testpmd
@@ -1937,8 +1938,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd-mac using SMT connected via vhost-user \
-| | ... | is setup \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
+| | ... | \| Configure guest VM with dpdk-testpmd-mac using SMT connected via \
+| | ... | vhost-user \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \
 | | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| ${6} \| ${5} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vm_name}
@@ -1966,7 +1967,7 @@
 | | ... | pmd_txd=${perf_qemu_qsz} | pmd_rxd=${perf_qemu_qsz}
 | | Return From Keyword | ${vm}
 
-| Guest VM with Linux Bridge connected via vhost-user is setup
+| Configure guest VM with linux bridge connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | linux bridge. Qemu Guest uses 2048M.
@@ -1981,7 +1982,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with Linux Bridge connected via vhost-user is setup \
+| | ... | \| Configure guest VM with linux bridge connected via vhost-user \
 | | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \
 | | ... | \| ${5} \|
 | | ...
@@ -2013,7 +2014,7 @@
 | | Set Interface State | ${vm} | ${br} | up | if_type=name
 | | Return From Keyword | ${vm}
 
-| Guest VM with Linux Bridge using SMT connected via vhost-user is setup
+| Configure guest VM with linux bridge using SMT connected via vhost-user
 | | [Documentation]
 | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting
 | | ... | linux bridge. Qemu Guest uses 2048M.
@@ -2060,7 +2061,7 @@
 | | Set Interface State | ${vm} | ${br} | up | if_type=name
 | | Return From Keyword | ${vm}
 
-| Guest VM with dpdk-testpmd Teardown
+| Tear down guest VM with dpdk-testpmd
 | | [Documentation]
 | | ... | Stop all qemu processes with dpdk-testpmd running on ${dut_node}.
 | | ... | Argument is dictionary of all qemu nodes running with its names.
@@ -2072,7 +2073,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM with dpdk-testpmd Teardown \| ${node['DUT1']} \
+| | ... | \| Tear down guest VM with dpdk-testpmd \| ${node['DUT1']} \
 | | ... | \| ${dut_vm_refs} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${dut_vm_refs}
@@ -2086,7 +2087,7 @@
 | | | Run Keyword | ${vm_name}.Qemu Clear Socks
 | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
 
-| Guest VM Teardown
+| Tear down guest VM
 | | [Documentation]
 | | ... | Stop all qemu processes running on ${dut_node}.
 | | ... | Argument is dictionary of all qemu nodes running with its names.
@@ -2097,7 +2098,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Guest VM Teardown \| ${node['DUT1']} \
+| | ... | \| Tear down guest VM \| ${node['DUT1']} \
 | | ... | \| ${dut_vm_refs} \|
 | | ...
 | | [Arguments] | ${dut_node} | ${dut_vm_refs}
@@ -2110,7 +2111,7 @@
 | | | Run Keyword | ${vm_name}.Qemu Clear Socks
 | | | Run Keyword If | '${index}' == '${vms_number}' | ${vm_name}.Qemu Kill All
 
-| Lisp IPv4 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv4 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \
 | | ... | Don`t set route.
 | | ...
@@ -2125,7 +2126,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv4 forwarding initialized in a 3-node circular topology \
+| | ... | \| Initialize LISP IPv4 forwarding in 3-node circular topology \
 | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
@@ -2146,17 +2147,17 @@
 | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_address}
 | | ... | ${dut1_if2_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
 | | ... | ${dut1_tg_address} | ${duts_prefix}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
 | | ... | ${dut1_dut2_address} | ${duts_prefix}
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
 | | ... | ${dut2_dut1_address} | ${duts_prefix}
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
 | | ... | ${dut2_tg_address} | ${duts_prefix}
 | | All Vpp Interfaces Ready Wait | ${nodes}
 
-| Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology
+| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology
 | | [Documentation] | Setup Lisp GPE IPv4 forwarding over IPsec.
 | | ...
 | | ... | *Arguments:*
@@ -2167,30 +2168,30 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp GPE IPv4 over IPsec initialized in a 3-node circular topology\
+| | ... | \| Initialize LISP GPE IPv4 over IPsec in 3-node circular topology\
 | | ... | \| ${encr_alg} \| ${auth_alg}
 | | ...
 | | [Arguments] | ${encr_alg} | ${auth_alg}
 | | ...
-| | IPsec Generate Keys | ${encr_alg} | ${auth_alg}
-| | Lisp IPv4 forwarding initialized in a 3-node circular topology
+| | Generate keys for IPSec | ${encr_alg} | ${auth_alg}
+| | Initialize LISP IPv4 forwarding in 3-node circular topology
 | | ... | ${dut1_to_dut2_ip4} | ${dut1_to_tg_ip4} | ${dut2_to_dut1_ip4}
 | | ... | ${dut2_to_tg_ip4} | ${prefix4}
-| | Set up LISP GPE topology
+| | Configure LISP GPE topology in 3-node circular topology
 | | ... | ${dut1} | ${dut1_if2} | ${NONE}
 | | ... | ${dut2} | ${dut2_if1} | ${NONE}
 | | ... | ${duts_locator_set} | ${dut1_ip4_eid} | ${dut2_ip4_eid}
 | | ... | ${dut1_ip4_static_adjacency} | ${dut2_ip4_static_adjacency}
-| | VPP Setup IPsec Manual Keyed Connection
+| | Configure manual keyed connection for IPSec
 | | ... | ${dut1} | ${dut1_if2} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut1_spi} | ${dut2_spi}
 | | ... | ${dut1_to_dut2_ip4} | ${dut2_to_dut1_ip4}
-| | VPP Setup IPsec Manual Keyed Connection
+| | Configure manual keyed connection for IPSec
 | | ... | ${dut2} | ${dut2_if1} | ${encr_alg} | ${encr_key}
 | | ... | ${auth_alg} | ${auth_key} | ${dut2_spi} | ${dut1_spi}
 | | ... | ${dut2_to_dut1_ip4} | ${dut1_to_dut2_ip4}
 
-| Lisp IPv6 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv6 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2205,7 +2206,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Lisp IPv6 forwarding initialized in a 3-node circular topology \
+| | ... | \| Initialize LISP IPv6 forwarding in 3-node circular topology \
 | | ... | \| ${dut1_dut2_address} \| ${dut1_tg_address} \
 | | ... | \| ${dut2_dut1_address} \| ${dut2_tg_address} \| ${duts_prefix} \|
 | | ...
@@ -2224,7 +2225,7 @@
 | | ... | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_address}
 | | ... | ${prefix}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_address}
@@ -2232,7 +2233,7 @@
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_address}
 | | ... | ${dut1_if2_mac}
 
-| Lisp IPv4 over IPv6 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv4 over IPv6 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2267,15 +2268,15 @@
 | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2}
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1}
 | | ... | ${dut1_tg_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if2} | ${dut1_dut2_ip6_address}
 | | ... | ${prefix6}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | ${dut2_dut1_ip6_address}
 | | ... | ${prefix6}
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2}
 | | ... | ${dut2_tg_ip4_address} | ${prefix4}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add arp on dut | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac}
 | | Add arp on dut | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip6_address}
@@ -2283,7 +2284,7 @@
 | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip6_address}
 | | ... | ${dut1_if2_mac}
 
-| Lisp IPv6 over IPv4 forwarding initialized in a 3-node circular topology
+| Initialize LISP IPv6 over IPv4 forwarding in 3-node circular topology
 | | [Documentation] | Custom setup of IPv4 over IPv6 topology on all DUT nodes \
 | | ... | Don`t set route.
 | | ...
@@ -2320,13 +2321,13 @@
 | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1}
 | | VPP Set If IPv6 Addr | ${dut1} | ${dut1_if1} | ${dut1_tg_ip6_address}
 | | ... | ${prefix6}
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2}
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2}
 | | ... | ${dut1_dut2_ip4_address} | ${prefix4}
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1}
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1}
 | | ... | ${dut2_dut1_ip4_address} | ${prefix4}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | ${dut2_tg_ip6_address}
 | | ... | ${prefix6}
-| | Vpp nodes ra suppress link layer | ${nodes}
+| | Suppress ICMPv6 router advertisement message | ${nodes}
 | | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
 | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
 | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_dut1_ip4_address}
@@ -2334,7 +2335,7 @@
 | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_dut2_ip4_address}
 | | ... | ${dut1_if2_mac}
 
-| SNAT is initialized in a 3-node circular topology
+| Initialize SNAT in 3-node circular topology
 | | [Documentation] | Initialization of 3-node topology with SNAT between DUTs:
 | | ... | - set interfaces up
 | | ... | - set IP addresses
@@ -2348,10 +2349,10 @@
 | | Set Interface State | ${dut2} | ${dut2_if2} | up
 | | All Vpp Interfaces Ready Wait | ${nodes}
 | | ...
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20
-| | IP addresses are set on interfaces | ${dut1} | ${dut1_if2} | 11.0.0.1 | 20
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if1} | 11.0.0.2 | 20
-| | IP addresses are set on interfaces | ${dut2} | ${dut2_if2} | 12.0.0.1 | 20
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20
+| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 11.0.0.1 | 20
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 11.0.0.2 | 20
+| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | 12.0.0.1 | 20
 | | ...
 | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
 | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
@@ -2368,10 +2369,10 @@
 | | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | 12.0.0.2 | ${dut2_if2}
 | | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | 11.0.0.1 | ${dut2_if1}
 | | ...
-| | Set inside and outside interfaces | ${dut1} | ${dut1_if1} | ${dut1_if2}
-| | Set deterministic mode for SNAT | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30
+| | Configure inside and outside interfaces | ${dut1} | ${dut1_if1} | ${dut1_if2}
+| | Configure deterministic mode for SNAT | ${dut1} | 20.0.0.0 | 18 | 200.0.0.0 | 30
 
-| DPDK 2-node Performance Suite Setup with DUT's NIC model
+| Set up DPDK 2-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Updates interfaces on all nodes and setup global
 | | ... | variables used in test cases based on interface model provided as an
@@ -2384,18 +2385,18 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| DPDK 2-node Performance Suite Setup with DUT's NIC model \
+| | ... | \| Set up DPDK 2-node performance topology with DUT's NIC model \
 | | ... | \| L2 \| Intel-X520-DA2 \|
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | 2-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 2-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut1} | ${dut1_if2} | ${topology_type}
 | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
-| DPDK 3-node Performance Suite Setup with DUT's NIC model
+| Set up DPDK 3-node performance topology with DUT's NIC model
 | | [Documentation]
 | | ... | Updates interfaces on all nodes and setup global
 | | ... | variables used in test cases based on interface model provided as an
@@ -2412,14 +2413,14 @@
 | | ...
 | | [Arguments] | ${topology_type} | ${nic_model}
 | | ...
-| | 3-node circular Topology Variables Setup with DUT interface model
+| | Set variables in 3-node circular topology with DUT interface model
 | | ... | ${nic_model}
 | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2}
 | | ... | ${dut1} | ${dut1_if1} | ${dut2} | ${dut2_if2} | ${topology_type}
 | | Initialize DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Initialize DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
-| DPDK 3-node Performance Suite Teardown
+| Tear down DPDK 3-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ... | Cleanup DPDK test environment.
@@ -2428,7 +2429,7 @@
 | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 | | Cleanup DPDK Environment | ${dut2} | ${dut2_if1} | ${dut2_if2}
 
-| DPDK 2-node Performance Suite Teardown
+| Tear down DPDK 2-node performance topology
 | | [Documentation]
 | | ... | Suite teardown phase with traffic generator teardown.
 | | ... | Cleanup DPDK test environment.
@@ -2436,7 +2437,7 @@
 | | Teardown traffic generator | ${tg}
 | | Cleanup DPDK Environment | ${dut1} | ${dut1_if1} | ${dut1_if2}
 
-| For DPDK Performance Test
+| Is DPDK performance test
 | | [Documentation]
 | | ... | Return TRUE if variable DPDK_TEST exist, otherwise FALSE.
 | | ${ret} | ${tmp}= | Run Keyword And Ignore Error
@@ -2444,12 +2445,12 @@
 | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
 | | Return From Keyword | ${FALSE}
 
-| Performance test setup
+| Set up performance test
 | | [Documentation] | Common test setup for performance tests.
 | | ...
 | | Reset VAT History On All DUTs | ${nodes}
 
-| Performance test teardown
+| Tear down performance discovery test
 | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
 | | ... | tests.
 | | ...
@@ -2460,7 +2461,8 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Performance test teardown \| 4.0mpps \| 64 \| 3-node-IPv4 \|
+| | ... | \| Tear down performance discovery test \| 4.0mpps \| 64 \
+| | ... | \| 3-node-IPv4 \|
 | | ...
 | | [Arguments] | ${rate} | ${framesize} | ${topology_type}
 | | ...
@@ -2471,7 +2473,7 @@
 | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
 | | Remove startup configuration of VPP from all DUTs
 
-| Performance ndrchk test teardown
+| Tear down performance ndrchk test
 | | [Documentation] | Common test teardown for ndrchk performance tests.
 | | ...
 | | Show VAT History On All DUTs | ${nodes}
@@ -2485,7 +2487,7 @@
 | | Show statistics on all DUTs
 | | Remove startup configuration of VPP from all DUTs
 
-| Performance test with vhost and VM with dpdk-testpmd teardown
+| Tear down performance test with vhost and VM with dpdk-testpmd
 | | [Documentation] | Common test teardown for performance tests which use
 | | ... | vhost(s) and VM(s) with dpdk-testpmd.
 | | ...
@@ -2500,7 +2502,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Performance test with vhost and VM with dpdk-testpmd teardown \
+| | ... | \| Tear down performance test with vhost and VM with dpdk-testpmd \
 | | ... | \| 4.0mpps \| 64 \| 3-node-IPv4 \| ${node['DUT1']} \| ${dut_vm_refs} \
 | | ... | \| ${node['DUT2']} \| ${dut_vm_refs} \|
 | | ...
@@ -2509,13 +2511,13 @@
 | | ... | ${dut2_node}=${None} | ${dut2_vm_refs}=${None}
 | | ...
 | | Show VAT History On All DUTs | ${nodes}
-| | Show Vpp Vhost On All DUTs
+| | Show VPP vhost on all DUTs
 | | Show statistics on all DUTs
 | | Run Keyword If Test Failed
 | | ... | Traffic should pass with no loss | ${perf_trial_duration} | ${rate}
 | | ... | ${framesize} | ${topology_type} | fail_on_loss=${False}
 | | Remove startup configuration of VPP from all DUTs
 | | Run keyword unless | ${dut1_node}==${None}
-| | ... | Guest VM with dpdk-testpmd Teardown | ${dut1} | ${dut1_vm_refs}
+| | ... | Tear down guest VM with dpdk-testpmd | ${dut1} | ${dut1_vm_refs}
 | | Run keyword unless | ${dut2_node}==${None}
-| | ... | Guest VM with dpdk-testpmd Teardown | ${dut2} | ${dut2_vm_refs}
+| | ... | Tear down guest VM with dpdk-testpmd | ${dut2} | ${dut2_vm_refs}
diff --git a/resources/libraries/robot/policer.robot b/resources/libraries/robot/policer.robot
index bf67ab7894..6e75a45965 100644
--- a/resources/libraries/robot/policer.robot
+++ b/resources/libraries/robot/policer.robot
@@ -25,7 +25,7 @@
 | Documentation | *Policer keywords*
 
 *** Keywords ***
-| Setup Topology for IPv4 policer testing
+| Configure topology for IPv4 policer test
 | | [Documentation] | Setup topology for IPv4 policer testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variables:
@@ -33,9 +33,9 @@
 | | ... | - dut_to_tg_if2_ip - DUT second interface IP address. Type: string
 | | ... | - tg_to_dut_if1_ip - TG first interface IP address. Type: string
 | | ... | - tg_to_dut_if2_ip - TG second interface IP address. Type: string
-| | Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']}
+| | Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']}
 | | ...                            | ${nodes['TG']}
-| | Interfaces in 2-node path are up
+| | Set interfaces in 2-node circular topology up
 | | Set Interface Address | ${dut_node} | ${dut_to_tg_if1}
 | | ...                   | ${dut_to_tg_if1_ip4} | ${ip4_plen}
 | | Set Interface Address | ${dut_node} | ${dut_to_tg_if2}
@@ -47,7 +47,7 @@
 | | Set Test Variable | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_ip4}
 | | Set Test Variable | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_ip4}
 
-| Setup Topology for IPv6 policer testing
+| Configure topology for IPv6 policer test
 | | [Documentation] | Setup topology for IPv6 policer testing.
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variables:
@@ -55,9 +55,9 @@
 | | ... | - dut_to_tg_if2_ip - DUT second interface IP address. Type: string
 | | ... | - tg_to_dut_if1_ip - TG first interface IP address. Type: string
 | | ... | - tg_to_dut_if2_ip - TG second interface IP address. Type: string
-| | Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']}
+| | Configure path in 2-node circular topology | ${nodes['TG']} | ${nodes['DUT1']}
 | | ...                            | ${nodes['TG']}
-| | Interfaces in 2-node path are up
+| | Set interfaces in 2-node circular topology up
 | | Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if1}
 | | ...                  | ${dut_to_tg_if1_ip6} | ${ip6_plen}
 | | Vpp Set If IPv6 Addr | ${dut_node} | ${dut_to_tg_if2}
@@ -70,7 +70,7 @@
 | | Set Test Variable | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_ip6}
 | | Set Test Variable | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_ip6}
 
-| Send Packet and Verify Marking
+| Send packet and verify marking
 | | [Documentation] | Send packet and verify DSCP of the received packet.
 | | ...
 | | ... | *Arguments:*
@@ -85,7 +85,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} \|
 | | [Arguments] | ${node} | ${tx_if} | ${rx_if} | ${src_mac} | ${dst_mac}
diff --git a/resources/libraries/robot/qemu.robot b/resources/libraries/robot/qemu.robot
index 5d1e3d5959..097f3cb1a8 100644
--- a/resources/libraries/robot/qemu.robot
+++ b/resources/libraries/robot/qemu.robot
@@ -16,33 +16,33 @@
 
 *** Keywords ***
 
-| Exist QEMU Build List
+| QEMU build list should exist
 | | [Documentation] | Return TRUE if variable QEMU_BUILD exist, otherwise FALSE
 | | ${ret} | ${tmp}=  | Run Keyword And Ignore Error
 | | ... | Variable Should Exist | @{QEMU_BUILD}
 | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
 | | Return From Keyword | ${FALSE}
 
-| Is QEMU Ready on Node
+| Is QEMU ready on node
 | | [Documentation] | Check if QEMU was built on the node before
 | | [Arguments] | ${node}
-| | ${ret}= | Exist QEMU Build List
+| | ${ret}= | QEMU build list should exist
 | | Return From Keyword If | ${ret} == ${FALSE} | ${FALSE}
 | | ${ret} | ${tmp}=  | Run Keyword And Ignore Error
 | | ... | Should Contain | ${QEMU_BUILD} | ${node['host']}
 | | Return From Keyword If | "${ret}" == "PASS" | ${TRUE}
 | | Return From Keyword | ${FALSE}
 
-| Add Node to QEMU Build List
+| Add node to QEMU build list
 | | [Documentation] | Add node to the list of nodes with builded QEMU (global
 | | ...             | variable QEMU_BUILD)
 | | [Arguments] | ${node}
-| | ${ret}= | Exist QEMU Build List
+| | ${ret}= | QEMU build list should exist
 | | Run Keyword If | ${ret} == ${TRUE}
 | | ... | Append To List | ${QEMU_BUILD} | ${node['host']}
 | | ... | ELSE | Set Global Variable | @{QEMU_BUILD} | ${node['host']}
 
-| Build QEMU on Node
+| Build QEMU on node
 | | [Documentation] | Build QEMU from sources on the Node. Nodes with successful
 | | ...             | QEMU build are stored in global variable list QEMU_BUILD
 | | ...
@@ -54,13 +54,13 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Build QEMU on Node \| ${node['DUT1']} \| False \| False \|
+| | ... | \| Build QEMU on node \| ${node['DUT1']} \| False \| False \|
 | | ...
 | | [Arguments] | ${node} | ${force_install}=${False} | ${apply_patch}=${False}
-| | ${ready}= | Is QEMU Ready on Node | ${node}
+| | ${ready}= | Is QEMU ready on node | ${node}
 | | Return From Keyword If | ${ready} == ${TRUE}
 | | Build QEMU | ${node}
-| | Add Node to QEMU Build List | ${node}
+| | Add node to QEMU build list | ${node}
 
 | Build QEMU on all DUTs
 | | [Documentation] | Build QEMU from sources on all DUTs. Nodes with successful
@@ -78,10 +78,10 @@
 | | [Arguments] | ${force_install}=${False} | ${apply_patch}=${False}
 | | ${duts}= | Get Matches | ${nodes} | DUT*
 | | :FOR | ${dut} | IN | @{duts}
-| | | Build QEMU on Node | ${nodes['${dut}']} | ${force_install} |
+| | | Build QEMU on node | ${nodes['${dut}']} | ${force_install} |
 | | | ... | ${apply_patch}
 
-| Stop and Clear QEMU
+| Stop and clear QEMU
 | | [Documentation] | Stop QEMU, clear used sockets and close SSH connection
 | | ...             | running on ${dut}, ${vm} is VM node info dictionary
 | | ...             | returned by qemu_start or None.
diff --git a/resources/libraries/robot/snat.robot b/resources/libraries/robot/snat.robot
index 12c7a71369..610a9150ee 100644
--- a/resources/libraries/robot/snat.robot
+++ b/resources/libraries/robot/snat.robot
@@ -17,8 +17,8 @@
 | Documentation | Keywords for SNAT feature in VPP.
 
 *** Keywords ***
-| Set inside and outside interfaces
-| | [Documentation] | Set inside and outside interfaces for SNAT.
+| Configure inside and outside interfaces
+| | [Documentation] | Configure inside and outside interfaces for SNAT.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - DUT node to set SNAT interfaces on. Type: dictionary
@@ -27,7 +27,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Set inside and outside interfaces \| ${nodes['DUT1']} \
+| | ... | \| Configure inside and outside interfaces \| ${nodes['DUT1']} \
 | | ... | \| FortyGigabitEtherneta/0/0 \| FortyGigabitEtherneta/0/1 \|
 | | ...
 | | [Arguments] | ${node} | ${int_in} | ${int_out}
@@ -36,7 +36,7 @@
 | | ${int_out_name}= | Set variable | ${node['interfaces']['${int_out}']['name']}
 | | Set SNAT Interfaces | ${node} | ${int_in_name} | ${int_out_name}
 
-| Set deterministic mode for SNAT
+| Configure deterministic mode for SNAT
 | | [Documentation] | Set deterministic behaviour of SNAT.
 | | ...
 | | ... | *Arguments:*
@@ -49,7 +49,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Set deterministic mode for SNAT \| ${nodes['DUT1']} \
+| | ... | \| Configure deterministic mode for SNAT \| ${nodes['DUT1']} \
 | | ... | \| 100.0.0.0 \| 12 \| 12.1.1.0 \| 24 \|
 | | ...
 | | [Arguments] | ${node} | ${ip_in} | ${subnet_in} | ${ip_out} | ${subnet_out}
@@ -57,8 +57,8 @@
 | | Set SNAT deterministic | ${node} | ${ip_in} | ${subnet_in} | ${ip_out}
 | | ... | ${subnet_out}
 
-| Set workers for SNAT
-| | [Documentation] | Set workers for SNAT.
+| Configure workers for SNAT
+| | [Documentation] | Configure workers for SNAT.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - DUT node to set SNAT workers on. Type: dictionary
@@ -67,7 +67,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Set workers for SNAT \| ${nodes['DUT1']} \| 12-23,36-47 \|
+| | ... | \| Configure workers for SNAT \| ${nodes['DUT1']} \| 12-23,36-47 \|
 | | ...
 | | [Arguments] | ${node} | ${lcores}
 | | ...
diff --git a/resources/libraries/robot/tagging.robot b/resources/libraries/robot/tagging.robot
index 1e481a2e5d..431812b3ab 100644
--- a/resources/libraries/robot/tagging.robot
+++ b/resources/libraries/robot/tagging.robot
@@ -21,7 +21,7 @@
 
 *** Keywords ***
 
-| VLAN subinterfaces initialized on 3-node topology
+| Initialize VLAN sub-interfaces in 3-node circular topology
 | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID}
 | | ...         | ${OUTER_VLAN_ID} | ${INNER_VLAN_ID} | ${TYPE_SUBIF}
 | | [Documentation] | *Create two subinterfaces on DUTs.*
@@ -59,7 +59,7 @@
 | | Set Test Variable | ${subif_name_2}
 | | Set Test Variable | ${subif_index_2}
 
-| VLAN dot1q subinterfaces initialized on 3-node topology
+| Initialize VLAN dot1q sub-interfaces in 3-node circular topology
 | | [Arguments] | ${DUT1} | ${INT1} | ${DUT2} | ${INT2} | ${SUB_ID}
 | | [Documentation] | *Create two dot1q subinterfaces on DUTs.*
 | | ...
@@ -78,7 +78,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| VLAN dot1q subinterfaces initialized on 3-node topology \
+| | ... | \| Initialize VLAN dot1q sub-interfaces in 3-node circular topology \
 | | ... | \| ${nodes['DUT1']} \| ${dut1_if2} \| ${nodes['DUT2']} \
 | | ... | \| ${dut1_if2} \| 10 \|
 | | ...
@@ -95,7 +95,7 @@
 | | Set Test Variable | ${subif_name_2}
 | | Set Test Variable | ${subif_index_2}
 
-| L2 tag rewrite method setup on interfaces
+| Configure L2 tag rewrite method on interfaces
 | | [Arguments] | ${DUT1} | ${SUB_INT1} | ${DUT2} | ${SUB_INT2}
 | | ...         | ${TAG_REWRITE_METHOD}
 | | [Documentation] | *Setup tag rewrite on sub-interfaces on DUTs.*
@@ -110,7 +110,7 @@
 | | L2 Vlan tag rewrite | ${DUT1} | ${SUB_INT1} | ${TAG_REWRITE_METHOD}
 | | L2 Vlan tag rewrite | ${DUT2} | ${SUB_INT2} | ${TAG_REWRITE_METHOD}
 
-| Interfaces and VLAN sub-interfaces inter-connected using L2-xconnect
+| Connect interfaces and VLAN sub-interfaces using L2XC
 | | [Arguments] | ${DUT1} | ${INT1} | ${SUB_INT1}
 | | ...         | ${DUT2} | ${INT2} | ${SUB_INT2}
 | | [Documentation] | *Add interface and subinterface to bidirectional
@@ -124,10 +124,10 @@
 | | ... | - INT2 - Interface to add to the cross-connect.
 | | ... | - SUB_INT2 - Sub-interface to add to the cross-connect.
 | | ...
-| | L2 setup xconnect on DUT | ${DUT1} | ${INT1} | ${SUB_INT1}
-| | L2 setup xconnect on DUT | ${DUT2} | ${INT2} | ${SUB_INT2}
+| | Configure L2XC | ${DUT1} | ${INT1} | ${SUB_INT1}
+| | Configure L2XC | ${DUT2} | ${INT2} | ${SUB_INT2}
 
-| Vlan Subinterface Created
+| Create vlan sub-interface
 | | [Documentation] | Create VLAN sub-interface on DUT and set admin status up.
 | | ...
 | | ... | *Arguments:*
@@ -141,7 +141,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Vlan Subinterface Created \| ${nodes['DUT1']} \| port3 \| 100 \|
+| | ... | \| Create vlan sub-interface \| ${nodes['DUT1']} \| port3 \| 100 \|
 | | ...
 | | [Arguments] | ${dut_node} | ${interface} | ${vlan_id}
 | | [Return] | ${vlan_name} | ${vlan_index}
@@ -150,7 +150,7 @@
 | | ... | ${dut_node} | ${interface_name} | ${vlan_id}
 | | Set Interface State | ${dut_node} | ${vlan_index} | up
 
-| Tagged Subinterface Created
+| Create tagged sub-interface
 | | [Documentation] | Create tagged sub-interface on DUT. Type of tagged \
 | | ... | sub-intreface depends on type_subif value:
 | | ... | - one_tag -> VLAN
@@ -171,7 +171,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Tagged Subinterface Created \| ${nodes['DUT1']} \| port1 \| 10 \
+| | ... | \| Create tagged sub-interface \| ${nodes['DUT1']} \| port1 \| 10 \
 | | ... | \| outer_vlan_id=100 \| inner_vlan_id=200 \
 | | ... | \| type_subif=two_tags dot1ad \|
 | | ...
@@ -185,7 +185,7 @@
 | | ... | outer_vlan_id=${outer_vlan_id} | inner_vlan_id=${inner_vlan_id}
 | | ... | type_subif=${type_subif}
 
-| L2 Tag Rewrite Method Is Set On Interface
+| Configure L2 tag rewrite method on interface
 | | [Documentation] | Set L2 tag rewrite on (sub-)interface on DUT
 | | ...
 | | ... | *Arguments:*
@@ -204,9 +204,9 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT1']} \
+| | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT1']} \
 | | ... | \| 9 \| pop-1 \|
-| | ... | \| L2 Tag Rewrite Method Is Set On Interface \| ${nodes['DUT2']} \
+| | ... | \| Configure L2 tag rewrite method on interface \| ${nodes['DUT2']} \
 | | ... | \| 10 \| translate-1-2 \| push_dot1q=${False} \| tag1_id=10 \
 | | ... | \| tag1_id=20 \|
 | | ...
diff --git a/resources/libraries/robot/testing_path.robot b/resources/libraries/robot/testing_path.robot
index e31ebd5214..b7543e1c4d 100644
--- a/resources/libraries/robot/testing_path.robot
+++ b/resources/libraries/robot/testing_path.robot
@@ -16,7 +16,7 @@
 | Library | resources.libraries.python.NodePath
 
 *** Keywords ***
-| Path for 2-node testing is set
+| Configure path in 2-node circular topology
 | | [Documentation] | Compute path for testing on two given nodes in circular
 | | ...             | topology and set corresponding test case variables.
 | | ...
@@ -43,7 +43,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 2-node testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path in 2-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${dut_node} | ${tg2_node}
@@ -69,7 +69,7 @@
 | | Set Test Variable | ${tg_node}
 | | Set Test Variable | ${dut_node}
 
-| Interfaces in 2-node path are up
+| Set interfaces in 2-node circular topology up
 | | [Documentation] | Set UP state on interfaces in 2-node path on nodes and
 | | ...             | wait for all interfaces are ready. Requires more than
 | | ...             | one link between nodes.
@@ -81,13 +81,13 @@
 | | ... | - No value returned.
 | | ...
 | | ... | _NOTE:_ This KW uses test variables sets in
-| | ... |         "Path for 2-node testing is set" KW.
+| | ... |         "Configure path in 2-node circular topology" KW.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 2-node testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path in 2-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \|
-| | ... | \| And Interfaces in 2-node path are up \|
+| | ... | \| And Set interfaces in 2-node circular topology up \|
 | | ...
 | | Set Interface State | ${tg_node} | ${tg_to_dut_if1} | up
 | | Set Interface State | ${tg_node} | ${tg_to_dut_if2} | up
@@ -95,7 +95,7 @@
 | | Set Interface State | ${dut_node} | ${dut_to_tg_if2} | up
 | | Vpp Node Interfaces Ready Wait | ${dut_node}
 
-| Path for 3-node testing is set
+| Configure path in 3-node circular topology
 | | [Documentation] | Compute path for testing on three given nodes in circular
 | | ...             | topology and set corresponding test case variables.
 | | ...
@@ -128,7 +128,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path in 3-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| ${nodes['TG']} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg2_node}
@@ -163,7 +163,7 @@
 | | Set Test Variable | ${dut1_node}
 | | Set Test Variable | ${dut2_node}
 
-| Interfaces in 3-node path are up
+| Set interfaces in 3-node circular topology up
 | | [Documentation]
 | | ... | Set UP state on interfaces in 3-node path on nodes and \
 | | ... | wait until all interfaces are ready.
@@ -175,13 +175,13 @@
 | | ... | - No value returned.
 | | ...
 | | ... | _NOTE:_ This KW uses test variables sets in
-| | ... |         "Path for 3-node testing is set" KW.
+| | ... |         "Configure path in 3-node circular topology" KW.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Given Path for 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| Given Configure path in 3-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \|
-| | ... | \| And Interfaces in 3-node path are up \|
+| | ... | \| And Set interfaces in 3-node circular topology up \|
 | | ...
 | | Set Interface State | ${tg_node} | ${tg_to_dut1} | up
 | | Set Interface State | ${tg_node} | ${tg_to_dut2} | up
@@ -192,7 +192,7 @@
 | | Vpp Node Interfaces Ready Wait | ${dut1_node}
 | | Vpp Node Interfaces Ready Wait | ${dut2_node}
 
-| Path for Double-Link 3-node testing is set
+| Configure path in double-link 3-node circular topology
 | | [Documentation]
 | | ... | Compute path for testing on three given nodes in circular \
 | | ... | topology with double link and set corresponding \
@@ -239,7 +239,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| Configure path in double-link 3-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['DUT2']} \| ${nodes['TG']} \|
 | | ...
 | | [Arguments] | ${tg_node} | ${dut1_node} | ${dut2_node} | ${tg2_node}
@@ -317,7 +317,7 @@
 | | Set Test Variable | ${dut2_to_dut1_if1_mac}
 | | Set Test Variable | ${dut2_to_dut1_if2_mac}
 
-| Interfaces in Double-Link 3-node path are UP
+| Set interfaces in double-link 3-node circular topology up
 | | [Documentation]
 | | ... | Set UP state on interfaces in 3-node double link path \
 | | ... | wait until all interfaces are ready.
@@ -329,11 +329,11 @@
 | | ... | - No value returned.
 | | ...
 | | ... | _NOTE:_ This KW uses test variables sets in
-| | ... |         "Path for Double-Link 3-node testing is set" KW.
+| | ... |         "Configure path in double-link 3-node circular topology" KW.
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Path for Double-Link 3-node testing is set \| ${nodes['TG']} \
+| | ... | \| Configure path in double-link 3-node circular topology \| ${nodes['TG']} \
 | | ... | \| ${nodes['DUT1']} \| ${nodes['TG']} \|
 | | ... | \| Interfaces in Double-Link 3-node testing are UP \|
 | | ...
diff --git a/resources/libraries/robot/traffic.robot b/resources/libraries/robot/traffic.robot
index 18db071e01..d39784666f 100644
--- a/resources/libraries/robot/traffic.robot
+++ b/resources/libraries/robot/traffic.robot
@@ -26,7 +26,7 @@
 | Documentation | Traffic keywords
 
 *** Keywords ***
-| Send Packet And Check Headers
+| Send packet and verify headers
 | | [Documentation] | Sends packet from IP (with source mac) to IP
 | | ...             | (with dest mac). There has to be 4 MAC addresses
 | | ...             | when using 2 node +
@@ -62,7 +62,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send Packet And Check Headers \| ${nodes['TG']} \| 10.0.0.1 \
+| | ... | \| Send packet and verify headers \| ${nodes['TG']} \| 10.0.0.1 \
 | | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
 | | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \|
 | | ...
@@ -94,7 +94,7 @@
 | | Run Traffic Script On Node | send_icmp_check_headers.py | ${tg_node} |
 | | ... | ${args}
 
-| Send packet from Port to Port should failed
+| Packet transmission from port to port should fail
 | | [Documentation] | Sends packet from ip (with specified mac) to ip
 | | ...             | (with dest mac). Using keyword : Send packet And Check
 | | ...             | Headers and subsequently checks the return value
@@ -119,7 +119,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send packet from Port to Port should failed \| ${nodes['TG']} \
+| | ... | \| Packet transmission from port to port should fail \| ${nodes['TG']} \
 | | ... | \| 10.0.0.1 \ \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \
 | | ... | \| 08:00:27:a2:52:5b \| eth3 \| 08:00:27:4d:ca:7a \
 | | ... | \| 08:00:27:7d:fd:10 \|
@@ -136,7 +136,7 @@
 | | ... | Run Traffic Script On Node | send_icmp_check_headers.py
 | | ... | ${tg_node} | ${args}
 
-| Send Packet And Check ARP Request
+| Send packet and verify ARP request
 | | [Documentation] | Send IP packet from tx_port and check if ARP Request\
 | | ...             | packet is received on rx_port.
 | | ...
@@ -183,7 +183,7 @@
 | | ... | --rx_arp_src_ip ${rx_arp_src_ip} | --rx_arp_dst_ip ${rx_arp_dst_ip}
 | | Run Traffic Script On Node | send_icmp_check_arp.py | ${tg_node} | ${args}
 
-| Send TCP or UDP packet
+| Send TCP or UDP packet and verify received packet
 | | [Documentation] | Sends TCP or UDP packet with specified source
 | | ...             | and destination port.
 | | ...
@@ -208,7 +208,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send TCP or UDP packet \| ${nodes['TG']} \
+| | ... | \| Send TCP or UDP packet 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 \| TCP \| 20 \| 80 \|
 | | ...
@@ -229,7 +229,7 @@
 | | Run Traffic Script On Node | send_tcp_udp.py
 | | ... | ${tg_node} | ${args}
 
-| Send TCP or UDP packet should failed
+| TCP or UDP packet transmission should fail
 | | [Documentation] | Sends TCP or UDP packet with specified source
 | | ...             | and destination port.
 | | ...
@@ -254,7 +254,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send TCP or UDP packet should failed \| ${nodes['TG']} \
+| | ... | \| TCP or UDP packet transmission should fail \| ${nodes['TG']} \
 | | ... | \| 16.0.0.1 \| 32.0.0.1 \| eth2 \| 08:00:27:cc:4f:54 \
 | | ... | \| eth4 \| 08:00:27:c9:6a:d5 \| TCP \| 20 \| 80 \|
 | | ...
@@ -276,7 +276,7 @@
 | | ... | Run Traffic Script On Node | send_tcp_udp.py
 | | ... | ${tg_node} | ${args}
 
-| Receive And Check Router Advertisement Packet
+| Receive and verify router advertisement packet
 | | [Documentation] | Wait until RA packet is received and then verify\
 | | ...             | specific fields of received RA packet.
 | | ...
@@ -293,7 +293,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Receive And Check Router Advertisement Packet \
+| | ... | \| Receive and verify router advertisement packet \
 | | ... | \| ${nodes['DUT1']} \| eth2 \| 08:00:27:cc:4f:54 \|
 | | ...
 | | [Arguments] | ${node} | ${rx_port} | ${src_mac} | ${interval}=${0}
@@ -304,7 +304,7 @@
 | | ... | --interval ${interval}
 | | Run Traffic Script On Node | check_ra_packet.py | ${node} | ${args}
 
-| Send Router Solicitation and check response
+| Send router solicitation and verify response
 | | [Documentation] | Send RS packet, wait for response and then verify\
 | | ...             | specific fields of received RA packet.
 | | ...
@@ -322,7 +322,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send Router Solicitation and check response \
+| | ... | \| Send router solicitation and verify response \
 | | ... | \| ${nodes['TG']} \| ${nodes['DUT1']} \| eth2 \
 | | ... | \| GigabitEthernet0/8/0 \| 10::10 \|
 | | ...
@@ -376,7 +376,7 @@
 | | ...                 | --src_ip | ${src_ip} | --dst_ip | ${tgt_ip}
 | | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args}
 
-| Send ARP Request should failed
+| ARP request should fail
 | | [Documentation] | Send ARP Request and
 | | ...             | the ARP Response should not be received.
 | | ...
@@ -402,7 +402,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send ARP Request should failed \| ${nodes['TG']} \| eth3 \
+| | ... | \| ARP request should fail \| ${nodes['TG']} \| eth3 \
 | | ... | \| 08:00:27:cc:4f:54 \| 08:00:27:c9:6a:d5 \
 | | ... | \| 10.0.0.100 \| 192.168.1.5 \|
 | | ...
@@ -415,7 +415,7 @@
 | | Run Keyword And Expect Error | ARP reply timeout
 | | ... | Run Traffic Script On Node | arp_request.py | ${tg_node} | ${args}
 
-| Send Packets And Check Multipath Routing
+| Send packets and verify multipath routing
 | | [Documentation] | Send 100 IP ICMP packets traffic and check if it is\
 | | ...             | divided into two paths.
 | | ...
diff --git a/resources/libraries/robot/vxlan.robot b/resources/libraries/robot/vxlan.robot
index 36a31584d0..27c9c7c3da 100644
--- a/resources/libraries/robot/vxlan.robot
+++ b/resources/libraries/robot/vxlan.robot
@@ -25,7 +25,7 @@
 | Library  | resources.libraries.python.NodePath
 
 *** Keywords ***
-| IP addresses are set on interfaces
+| Configure IP addresses and neighbors on interfaces
 | | [Documentation] | *Set IPv4 addresses on interfaces on DUTs.*
 | | ... | If interface index is None then is determines with Get Interface Sw Index
 | | ... | in this case it is required the interface to be present in topology dict.
@@ -64,15 +64,15 @@
 | | [Arguments] | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP}
 | | Create VXLAN interface | ${DUT} | ${VNI} | ${SRC_IP} | ${DST_IP}
 
-| Interfaces are added to BD
+| Add interfaces to L2BD
 | | [Arguments] | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2}
 | | Vpp Add L2 Bridge Domain | ${DUT} | ${BID} | ${INTERFACE_1} | ${INTERFACE_2}
 
-| Interfaces are added to xconnect
+| Add interfaces to L2XC
 | | [Arguments] | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2}
-| | L2 setup xconnect on DUT | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2}
+| | Configure L2XC | ${DUT} | ${INTERFACE_1} | ${INTERFACE_2}
 
-| Vlan interfaces for VXLAN are created
+| Create vlan interfaces for VXLAN
 | | [Documentation] | *Create VLAN subinterface on interfaces on DUTs with given VLAN ID.*
 | | ...
 | | ... | _Set testcase variables with name and index of created interfaces:_
@@ -95,7 +95,7 @@
 | | Set Test Variable | ${dut2s_vlan_name}
 | | Set Test Variable | ${dut2s_vlan_index}
 
-| Send VXLAN receive VXLAN Packet
+| Send VXLAN encapsulated packet and verify received packet
 | | [Documentation] | Send VXLAN encapsulated Ethernet frame and check \
 | | ... | received one.
 | | ...
@@ -119,7 +119,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Send VXLAN receive VXLAN Packet \| ${tg_node} \| port4 \| port4  \
+| | ... | \| Send VXLAN encapsulated packet and verify received packet \| ${tg_node} \| port4 \| port4  \
 | | ... | \| fa:16:3e:6d:f9:c5 \| fa:16:3e:e6:6d:9a \| 192.168.0.1  \
 | | ... | \| 192.168.0.2 \| ${101} \| 192.168.0.2 \| 192.168.0.1 \| ${102} \|
 | | ...
diff --git a/resources/tools/rename_robot_keywords.py b/resources/tools/rename_robot_keywords.py
new file mode 100755
index 0000000000..9f27b4aaec
--- /dev/null
+++ b/resources/tools/rename_robot_keywords.py
@@ -0,0 +1,243 @@
+#!/usr/bin/python
+
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This script renames the given robot keywords in the given directory
+recursively.
+
+Example:
+
+  ./rename_robot_keywords.py -i kws.csv -s ";" -d ~/ws/vpp/git/csit/ -vvv
+
+  Input file "kws.csv" is CSV file exported from e.g. MS Excel. Its structure
+  must be:
+
+    <Old keyword name><separator><New keyword name>
+
+  One keyword per line.
+
+"""
+
+import argparse
+import sys
+import re
+from os import walk, rename
+from os.path import join
+
+
+def time_interval(func):
+    """Decorator function to measure the time spent by the decorated function.
+
+    :param func: Decorated function.
+    :type func: Callable object.
+    :returns: Wrapper function.
+    :rtype: Callable object.
+    """
+
+    import time
+
+    def wrapper(*args, **kwargs):
+        start = time.clock()
+        result = func(*args, **kwargs)
+        stop = time.clock()
+        print("\nRenaming done in {:.5g} seconds\n".
+              format(stop - start))
+        return result
+    return wrapper
+
+
+def get_files(path, extension):
+    """Generates the list of files to process.
+
+    :param path: Path to files.
+    :param extension: Extension of files to process. If it is the empty string,
+    all files will be processed.
+    :type path: str
+    :type extension: str
+    :returns: List of files to process.
+    :rtype: list
+    """
+
+    file_list = list()
+    for root, dirs, files in walk(path):
+        for filename in files:
+            if extension:
+                if filename.endswith(extension):
+                    file_list.append(join(root, filename))
+            else:
+                file_list.append(join(root, filename))
+
+    return file_list
+
+
+def read_keywords(args):
+    """This function reads the keywords from the input file and creates:
+
+    - a dictionary where the key is the old name and the value is the new name,
+      these keywords will be further processed.
+    - a list of keywords which will not be processed, typically keywords with
+    argument(s) in its names.
+    - a list of duplicates - duplicated keyword names or names which are parts
+    of another keyword name, they will not be processed.
+
+    :param args:  Parsed arguments.
+    :type args: ArgumentParser
+    :returns: keyword names - dictionary where the key is the old name and the
+    value is the new name; ignored keyword names - list of keywords which will
+    not be processed; duplicates - duplicated keyword names or names which are
+    parts of another keyword name, they will not be processed.
+    :rtype: tuple(dict, list, list)
+    """
+
+    kw_names = dict()
+    ignored_kw_names = list()
+    duplicates = list()
+
+    for line in args.input:
+        old_name, new_name = line.split(args.separator)
+        if '$' in old_name:
+            ignored_kw_names.append((old_name, new_name[:-1]))
+        elif old_name in kw_names.keys():
+            duplicates.append((old_name, new_name[:-1]))
+        else:
+            kw_names[old_name] = new_name[:-1]
+
+    # Remove duplicates:
+    for old_name, _ in duplicates:
+        new_name = kw_names.pop(old_name, None)
+        if new_name:
+            duplicates.append((old_name, new_name))
+
+    # Find KW names which are parts of other KW names:
+    for old_name in kw_names.keys():
+        count = 0
+        for key in kw_names.keys():
+            if old_name in key:
+                count += 1
+            if old_name in kw_names[key]:
+                if old_name != key:
+                    count += 1
+        if count > 1:
+            duplicates.append((old_name, kw_names[old_name]))
+            kw_names.pop(old_name)
+
+    return kw_names, ignored_kw_names, duplicates
+
+
+def rename_keywords(file_list, kw_names, args):
+    """Rename the keywords in specified files.
+
+    :param file_list: List of files to be processed.
+    :param kw_names: Dictionary  where the key is the old name and the value is
+    the new name
+    :type file_list: list
+    :type kw_names: dict
+    """
+
+    kw_not_found = list()
+
+    for old_name, new_name in kw_names.items():
+        kw_found = False
+        if args.verbosity > 0:
+            print("\nFrom: {}\n  To: {}\n".format(old_name, new_name))
+        for file_name in file_list:
+            tmp_file_name = file_name + ".new"
+            with open(file_name) as file_read:
+                file_write = open(tmp_file_name, 'w')
+                occurrences = 0
+                for line in file_read:
+                    new_line = re.sub(old_name, new_name, line)
+                    file_write.write(new_line)
+                    if new_line != line:
+                        occurrences += 1
+                if occurrences:
+                    kw_found = True
+                    if args.verbosity > 1:
+                        print(" {:3d}: {}".format(occurrences, file_name))
+                file_write.close()
+            rename(tmp_file_name, file_name)
+        if not kw_found:
+            kw_not_found.append(old_name)
+
+    if args.verbosity > 0:
+        print("\nKeywords not found:")
+        for item in kw_not_found:
+            print("  {}".format(item))
+
+
+def parse_args():
+    """Parse arguments from command line.
+
+    :returns: Parsed arguments.
+    :rtype: ArgumentParser
+    """
+
+    parser = argparse.ArgumentParser(description=__doc__,
+                                     formatter_class=argparse.
+                                     RawDescriptionHelpFormatter)
+    parser.add_argument("-i", "--input",
+                        required=True,
+                        type=argparse.FileType('r'),
+                        help="Text file with the old keyword name and the new "
+                             "keyword name separated by separator per line.")
+    parser.add_argument("-s", "--separator",
+                        default=";",
+                        type=str,
+                        help="Separator which separates the old and the new "
+                             "keyword name.")
+    parser.add_argument("-d", "--dir",
+                        required=True,
+                        type=str,
+                        help="Directory with robot files where the keywords "
+                             "should be recursively searched.")
+    parser.add_argument("-v", "--verbosity", action="count",
+                        help="Set the output verbosity.")
+    return parser.parse_args()
+
+
+@time_interval
+def main():
+    """Main function."""
+
+    args = parse_args()
+
+    kw_names, ignored_kw_names, duplicates = read_keywords(args)
+
+    file_list = get_files(args.dir, "robot")
+
+    if args.verbosity > 2:
+        print("\nList of files to be processed:")
+        for item in file_list:
+            print("  {}".format(item))
+        print("\n{} files to be processed.\n".format(len(file_list)))
+
+        print("\nList of keywords to be renamed:")
+        for item in kw_names:
+            print("  {}".format(item))
+        print("\n{} keywords to be renamed.\n".format(len(kw_names)))
+
+    rename_keywords(file_list, kw_names, args)
+
+    if args.verbosity >= 0:
+        print("\nIgnored keywords: ({})".format(len(ignored_kw_names)))
+        for old, new in ignored_kw_names:
+            print("  From: {}\n    To: {}\n".format(old, new))
+
+        print("\nIgnored duplicates ({}):".format(len(duplicates)))
+        for old, new in duplicates:
+            print("  From: {}\n    To: {}\n".format(old, new))
+
+
+if __name__ == "__main__":
+    sys.exit(main())
author	Tibor Frank <tifrank@cisco.com>	2017-06-01 07:00:50 +0200
committer	Tibor Frank <tifrank@cisco.com>	2017-06-08 14:23:08 +0200
commit	430afafb4cadf503ccee99c09f6de7402f5404c7 (patch)
tree	ef79d59dba8558b85af1b7ad2fe89d3c9c49b5af /resources
parent	7436d8bdf60bca9b80fb76781e1f709bbcd435da (diff)