Remove leading tc[nn] from test names

The test names are unique without it and the information doesn't add
anything extra.

Change-Id: Idc7d6d1d21c8c05691e1757227a0a3787406d370
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

63 files changed, 756 insertions, 756 deletions

diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
index 960dfe129c..7200305d5d 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1ad-l2xcbase-ndrpdr
+| 64B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1ad-l2xcbase-ndrpdr
+| 64B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1ad-l2xcbase-ndrpdr
+| 64B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1ad-l2xcbase-ndrpdr
+| 1518B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1ad-l2xcbase-ndrpdr
+| 1518B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1ad-l2xcbase-ndrpdr
+| 1518B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1ad-l2xcbase-ndrpdr
+| 9000B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1ad-l2xcbase-ndrpdr
+| 9000B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1ad-l2xcbase-ndrpdr
+| 9000B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1ad-l2xcbase-ndrpdr
+| IMIX-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1ad-l2xcbase-ndrpdr
+| IMIX-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1ad-l2xcbase-ndrpdr
+| IMIX-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 753d7e9f34..057be64b7c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 16ebb87341..811d654106 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -99,50 +99,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-ndrpdr
+| 64B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-ndrpdr
+| 64B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-ndrpdr
+| 64B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
index 33c45320de..577fb89bf6 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
index 62aa381dd5..d710ee3d70 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
index e488b7d514..ef27fbcd9f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
index b952a19149..1036997ce9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
index 6ec02a4aff..f5a867e0f9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
index 08d515c725..bf24641933 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
index 92ca2a1a95..bdf06621b6 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
index 5083c68e8b..6fe134e92f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
index 8772ac537e..487fb31b30 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
index b5a48354ac..97acad3212 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
index 318e584a71..440274ffd0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
index 53e5b96e65..20130c62e9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
index b51807de55..46f11294c5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
index 298714c126..d6fe9a8f00 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
index fc828e9bd5..8bdc7f5874 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
index 9a6828ae1a..5d57e29fa9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
index 5d502b86b9..2894d37341 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
index 636997b807..aceeffea69 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
index b71f3eb227..e19ba3fffe 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
index c026d79742..9e237107fb 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
index d72a4e410f..fed44e8f1e 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
index 97c0d724f8..11dc34aac3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
index 0e1b1616a8..3313d24a09 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
index 822420b6b0..d0690bc702 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
index 3e65aadfb0..daaeff11dd 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
index a4a46b1d34..f9f49fc203 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
index 7c8dc8cf78..f92774f71a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index 39a5cfd41e..1bc9feaa04 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
index 25416a0d8c..e8e736e327 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
index 556c1f46e4..00e94ea883 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
index 51e09567cb..3761a7f8cf 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
index 248dce0c10..1e5b504633 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
index ef16a2006b..cdadd951b0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
index 386f2ca05e..4d20c2a195 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
index 21c0585338..b4cf6b36fa 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
index 895891a939..9d64a13296 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
index ad22c93141..66758f61a2 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
index 2ae8eb4f34..7db0ce8c2c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
index 9f8c8afb06..db55802ad0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
index 9adb7d4ca3..8f83dbd2db 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
index 3c64be014d..e308392dc3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
index 473cb41640..e7d129ef6b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
index 5e0f9ebcc8..61cbb84002 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
index d0c9b7fb79..3b38c86d6c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
index 7b7c535a2e..4d953e733b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
index 5649b1d990..5cecd2b33f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index e29863e242..b09fd51f3f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index b98d943e23..7cc8ac7352 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 83b79deded..8eadec4df5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
index 4f80b2e1da..5a8697f17c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2patch-ndrpdr
+| 64B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2patch-ndrpdr
+| 64B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2patch-ndrpdr
+| 64B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2patch-ndrpdr
+| 1518B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2patch-ndrpdr
+| 1518B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2patch-ndrpdr
+| 1518B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2patch-ndrpdr
+| 9000B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2patch-ndrpdr
+| 9000B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2patch-ndrpdr
+| 9000B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2patch-ndrpdr
+| IMIX-1c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2patch-ndrpdr
+| IMIX-2c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2patch-ndrpdr
+| IMIX-4c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index 11739bb2d3..5ad4572bc3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-ndrpdr
+| 64B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-ndrpdr
+| 64B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-ndrpdr
+| 64B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-ndrpdr
+| 1518B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-ndrpdr
+| 1518B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-ndrpdr
+| 1518B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-ndrpdr
+| 9000B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-ndrpdr
+| 9000B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-ndrpdr
+| 9000B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-ndrpdr
+| IMIX-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-ndrpdr
+| IMIX-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-ndrpdr
+| IMIX-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
index 46b9996fff..7588d89237 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 45daea4975..ef22a69f4c 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 3148be3ca7..052ebc2d9e 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-ndrpdr
+| 64B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-ndrpdr
+| 64B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-ndrpdr
+| 64B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index fd431995e5..25c4aded99 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index afbbc74e97..7be4e84d70 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index 21f4ec0202..8f61a5cb29 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 52088d5dd4..d9e89b6fd0 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
index 54632c14db..81b7817a0f 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2patch-ndrpdr
+| 64B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2patch-ndrpdr
+| 64B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2patch-ndrpdr
+| 64B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2patch-ndrpdr
+| 1518B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2patch-ndrpdr
+| 1518B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2patch-ndrpdr
+| 1518B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2patch-ndrpdr
+| 9000B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2patch-ndrpdr
+| 9000B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2patch-ndrpdr
+| 9000B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2patch-ndrpdr
+| IMIX-1c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2patch-ndrpdr
+| IMIX-2c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2patch-ndrpdr
+| IMIX-4c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index 2e905e0776..f2f41dda40 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-ndrpdr
+| 64B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-ndrpdr
+| 64B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-ndrpdr
+| 64B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-ndrpdr
+| 1518B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-ndrpdr
+| 1518B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-ndrpdr
+| 1518B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-ndrpdr
+| 9000B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-ndrpdr
+| 9000B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-ndrpdr
+| 9000B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-ndrpdr
+| IMIX-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-ndrpdr
+| IMIX-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-ndrpdr
+| IMIX-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}