From 1f6797ed6b662130f55d7629453c5010ed94162a Mon Sep 17 00:00:00 2001
From: pmikus <pmikus@cisco.com>
Date: Fri, 19 Feb 2021 12:51:16 +0000
Subject: [PATCH] FIX: Naming convention compliance

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Idcee623abbc5568fc6ca49113bc2ff8add179046
---
 docs/job_specs/report_coverage/2n-clx/gso-00.md    | 24 +++++++++++-----------
 docs/job_specs/report_coverage/2n-skx/gso-00.md    | 24 +++++++++++-----------
 docs/job_specs/report_coverage/2n-zn2/gso-00.md    | 24 +++++++++++-----------
 .../report_iterative/2n-clx/vpp-gso-mrr-00.md      | 24 +++++++++++-----------
 .../report_iterative/2n-skx/vpp-gso-mrr-00.md      | 24 +++++++++++-----------
 .../report_iterative/2n-zn2/vpp-gso-mrr-00.md      | 24 +++++++++++-----------
 resources/libraries/python/autogen/Regenerator.py  |  2 +-
 ...1x710-ethip4-ip4base-2tap-gso-iperf3-mrr.robot} |  8 ++++----
 ...ge2p1x710-ethip4-ip4base-2tap-iperf3-mrr.robot} |  8 ++++----
 ...710-ethip4-ip4base-2vhost-gso-iperf3-mrr.robot} |  8 ++++----
 ...2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot} |  8 ++++----
 11 files changed, 89 insertions(+), 89 deletions(-)
 rename tests/vpp/perf/gso/{2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3.robot => 2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3-mrr.robot} (95%)
 rename tests/vpp/perf/gso/{2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3.robot => 2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3-mrr.robot} (96%)
 rename tests/vpp/perf/gso/{2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3.robot => 2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3-mrr.robot} (95%)
 rename tests/vpp/perf/gso/{2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3.robot => 2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot} (96%)

diff --git a/docs/job_specs/report_coverage/2n-clx/gso-00.md b/docs/job_specs/report_coverage/2n-clx/gso-00.md
index 25883f370d..6d4c0bd8ae 100644
--- a/docs/job_specs/report_coverage/2n-clx/gso-00.md
+++ b/docs/job_specs/report_coverage/2n-clx/gso-00.md
@@ -10,24 +10,24 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
 ## ./ip4
 ## ./ip4_tunnels
 ## ./ip6
diff --git a/docs/job_specs/report_coverage/2n-skx/gso-00.md b/docs/job_specs/report_coverage/2n-skx/gso-00.md
index c7e4025fff..7eef249298 100644
--- a/docs/job_specs/report_coverage/2n-skx/gso-00.md
+++ b/docs/job_specs/report_coverage/2n-skx/gso-00.md
@@ -10,24 +10,24 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
 ## ./ip4
 ## ./ip4_tunnels
 ## ./ip6
diff --git a/docs/job_specs/report_coverage/2n-zn2/gso-00.md b/docs/job_specs/report_coverage/2n-zn2/gso-00.md
index b52e219a8d..6073006362 100644
--- a/docs/job_specs/report_coverage/2n-zn2/gso-00.md
+++ b/docs/job_specs/report_coverage/2n-zn2/gso-00.md
@@ -10,24 +10,24 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
 ## ./ip4
 ## ./ip4_tunnels
 ## ./ip6
diff --git a/docs/job_specs/report_iterative/2n-clx/vpp-gso-mrr-00.md b/docs/job_specs/report_iterative/2n-clx/vpp-gso-mrr-00.md
index c223d9d27a..ce93ded1f8 100644
--- a/docs/job_specs/report_iterative/2n-clx/vpp-gso-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-clx/vpp-gso-mrr-00.md
@@ -8,21 +8,21 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
diff --git a/docs/job_specs/report_iterative/2n-skx/vpp-gso-mrr-00.md b/docs/job_specs/report_iterative/2n-skx/vpp-gso-mrr-00.md
index 4c258c55c0..6ab80c40e0 100644
--- a/docs/job_specs/report_iterative/2n-skx/vpp-gso-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-skx/vpp-gso-mrr-00.md
@@ -8,21 +8,21 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
diff --git a/docs/job_specs/report_iterative/2n-zn2/vpp-gso-mrr-00.md b/docs/job_specs/report_iterative/2n-zn2/vpp-gso-mrr-00.md
index eaea200c08..ae164d2347 100644
--- a/docs/job_specs/report_iterative/2n-zn2/vpp-gso-mrr-00.md
+++ b/docs/job_specs/report_iterative/2n-zn2/vpp-gso-mrr-00.md
@@ -8,21 +8,21 @@
 ### intel-xxv710
 #### drv_tap
 ##### ethip4-ip4base-2tap-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-gso-iperf3
 #### drv_tap
 ##### ethip4-ip4base-2tap
-1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
-4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap
+1c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_tap AND ethip4-ip4base-2tap-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost-gso
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-gso-iperf3
 #### drv_vhost
 ##### ethip4-ip4base-2vhost
-1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
-4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost
+1c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+2c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
+4c AND 128kb AND mrr AND xxv710 AND drv_vhost AND ethip4-ip4base-2vhost-iperf3
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index a8de34ff7e..92860b02e9 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -565,7 +565,7 @@ class Regenerator:
                     hs_quic_kwargs_list if u"quic" in in_filename \
                     else hs_bps_kwargs_list
                 write_tcp_files(in_filename, in_prolog, hoststack_kwargs_list)
-            elif in_filename.endswith(u"-iperf3.robot"):
+            elif in_filename.endswith(u"-iperf3-mrr.robot"):
                 write_iperf3_files(in_filename, in_prolog, iperf3_kwargs_list)
             else:
                 raise RuntimeError(
diff --git a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3.robot b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3-mrr.robot
similarity index 95%
rename from tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3.robot
rename to tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3-mrr.robot
index 6e4cede6d6..b88ebf1f2b 100644
--- a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3.robot
+++ b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-gso-iperf3-mrr.robot
@@ -17,7 +17,7 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
 | ... | NIC_Intel-X710 | IP4FWD | BASE | IP4BASE | DRV_TAP
 | ... | RXQ_SIZE_4096 | TXQ_SIZE_4096 | GSO_TRUE
-| ... | ethip4-ip4base-2tap-gso
+| ... | ethip4-ip4base-2tap-gso-iperf3
 |
 | Suite Setup | Setup suite topology interfaces
 | Suite Teardown | Tear down suite
@@ -99,14 +99,14 @@
 | | Then Traffic should pass with maximum rate on iPerf3
 
 *** Test Cases ***
-| 128KB-1c-ethip4-ip4base-2tap-gso-iperf3
+| 128KB-1c-ethip4-ip4base-2tap-gso-iperf3-mrr
 | | [Tags] | 128KB | 1C
 | | frame_size=${128000} | phy_cores=${1}
 
-| 128KB-2c-ethip4-ip4base-2tap-gso-iperf3
+| 128KB-2c-ethip4-ip4base-2tap-gso-iperf3-mrr
 | | [Tags] | 128KB | 2C
 | | frame_size=${128000} | phy_cores=${2}
 
-| 128KB-4c-ethip4-ip4base-2tap-gso-iperf3
+| 128KB-4c-ethip4-ip4base-2tap-gso-iperf3-mrr
 | | [Tags] | 128KB | 4C
 | | frame_size=${128000} | phy_cores=${4}
diff --git a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3.robot b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3-mrr.robot
similarity index 96%
rename from tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3.robot
rename to tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3-mrr.robot
index af05129a28..c356be71e0 100644
--- a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3.robot
+++ b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2tap-iperf3-mrr.robot
@@ -17,7 +17,7 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
 | ... | NIC_Intel-X710 | IP4FWD | BASE | IP4BASE | DRV_TAP
 | ... | RXQ_SIZE_4096 | TXQ_SIZE_4096 | GSO_FALSE
-| ... | ethip4-ip4base-2tap
+| ... | ethip4-ip4base-2tap-iperf3
 |
 | Suite Setup | Setup suite topology interfaces
 | Suite Teardown | Tear down suite
@@ -99,14 +99,14 @@
 | | Then Traffic should pass with maximum rate on iPerf3
 
 *** Test Cases ***
-| 128KB-1c-ethip4-ip4base-2tap-iperf3
+| 128KB-1c-ethip4-ip4base-2tap-iperf3-mrr
 | | [Tags] | 128KB | 1C
 | | frame_size=${128000} | phy_cores=${1}
 
-| 128KB-2c-ethip4-ip4base-2tap-iperf3
+| 128KB-2c-ethip4-ip4base-2tap-iperf3-mrr
 | | [Tags] | 128KB | 2C
 | | frame_size=${128000} | phy_cores=${2}
 
-| 128KB-4c-ethip4-ip4base-2tap-iperf3
+| 128KB-4c-ethip4-ip4base-2tap-iperf3-mrr
 | | [Tags] | 128KB | 4C
 | | frame_size=${128000} | phy_cores=${4}
diff --git a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3.robot b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3-mrr.robot
similarity index 95%
rename from tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3.robot
rename to tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3-mrr.robot
index b2d3ff5751..5dfde26e06 100644
--- a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3.robot
+++ b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-gso-iperf3-mrr.robot
@@ -17,7 +17,7 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
 | ... | NIC_Intel-X710 | IP4FWD | BASE | IP4BASE | DRV_VHOST
 | ... | RXQ_SIZE_4096 | TXQ_SIZE_4096 | GSO_TRUE
-| ... | ethip4-ip4base-2vhost-gso
+| ... | ethip4-ip4base-2vhost-gso-iperf3
 |
 | Suite Setup | Setup suite topology interfaces
 | Suite Teardown | Tear down suite
@@ -108,14 +108,14 @@
 | | Traffic should pass with maximum rate on iPerf3
 
 *** Test Cases ***
-| 128KB-1c-ethip4-ip4base-2vhost-gso-iperf3
+| 128KB-1c-ethip4-ip4base-2vhost-gso-iperf3-mrr
 | | [Tags] | 128KB | 1C
 | | frame_size=${128000} | phy_cores=${1}
 
-| 128KB-2c-ethip4-ip4base-2vhost-gso-iperf3
+| 128KB-2c-ethip4-ip4base-2vhost-gso-iperf3-mrr
 | | [Tags] | 128KB | 2C
 | | frame_size=${128000} | phy_cores=${2}
 
-| 128KB-4c-ethip4-ip4base-2vhost-gso-iperf3
+| 128KB-4c-ethip4-ip4base-2vhost-gso-iperf3-mrr
 | | [Tags] | 128KB | 4C
 | | frame_size=${128000} | phy_cores=${4}
diff --git a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3.robot b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot
similarity index 96%
rename from tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3.robot
rename to tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot
index f512be57b2..56d35326d9 100644
--- a/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3.robot
+++ b/tests/vpp/perf/gso/2n1l-10ge2p1x710-ethip4-ip4base-2vhost-iperf3-mrr.robot
@@ -17,7 +17,7 @@
 | Force Tags | 2_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
 | ... | NIC_Intel-X710 | IP4FWD | BASE | IP4BASE | DRV_VHOST
 | ... | RXQ_SIZE_1024 | TXQ_SIZE_1024 | GSO_TRUE
-| ... | ethip4-ip4base-2vhost-gso
+| ... | ethip4-ip4base-2vhost-iperf3
 |
 | Suite Setup | Setup suite topology interfaces
 | Suite Teardown | Tear down suite
@@ -108,14 +108,14 @@
 | | Traffic should pass with maximum rate on iPerf3
 
 *** Test Cases ***
-| 128KB-1c-ethip4-ip4base-2vhost-iperf3
+| 128KB-1c-ethip4-ip4base-2vhost-iperf3-mrr
 | | [Tags] | 128KB | 1C
 | | frame_size=${128000} | phy_cores=${1}
 
-| 128KB-2c-ethip4-ip4base-2vhost-iperf3
+| 128KB-2c-ethip4-ip4base-2vhost-iperf3-mrr
 | | [Tags] | 128KB | 2C
 | | frame_size=${128000} | phy_cores=${2}
 
-| 128KB-4c-ethip4-ip4base-2vhost-iperf3
+| 128KB-4c-ethip4-ip4base-2vhost-iperf3-mrr
 | | [Tags] | 128KB | 4C
 | | frame_size=${128000} | phy_cores=${4}
-- 
2.16.6