From be5265bc9612f5aedf4f25720c4bd8941e359410 Mon Sep 17 00:00:00 2001
From: Juraj Linkeš <juraj.linkes@pantheon.tech>
Date: Fri, 22 May 2020 14:25:24 +0200
Subject: Remove leading tc[nn] from test names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot     | 24 +++++++++++-----------
 ...x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot | 24 +++++++++++-----------
 ...710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 24 +++++++++++-----------
 .../ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot    | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot   | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot    | 24 +++++++++++-----------
 .../ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...0ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...hip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...dp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...p-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...p-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...p-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 .../2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot    | 24 +++++++++++-----------
 ...x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot | 24 +++++++++++-----------
 ...710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot | 24 +++++++++++-----------
 .../2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot   | 24 +++++++++++-----------
 ...1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot | 24 +++++++++++-----------
 ...0ge2p1x710-ethip4-ip4scale200k-rnd-ndrpdr.robot | 24 +++++++++++-----------
 ...n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot | 24 +++++++++++-----------
 ...10ge2p1x710-ethip4-ip4scale20k-rnd-ndrpdr.robot | 24 +++++++++++-----------
 ...2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot | 24 +++++++++++-----------
 ...-10ge2p1x710-ethip4-ip4scale2m-rnd-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...0ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...p-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot | 24 +++++++++++-----------
 70 files changed, 840 insertions(+), 840 deletions(-)

(limited to 'tests/vpp/perf/ip4')

diff --git a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index 04eb22c630..7777d5b3a6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -96,50 +96,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-ip4base-ndrpdr
+| 64B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-ip4base-ndrpdr
+| 64B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-ip4base-ndrpdr
+| 64B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-ip4base-ndrpdr
+| 1518B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-ip4base-ndrpdr
+| 1518B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-ip4base-ndrpdr
+| 1518B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-ip4base-ndrpdr
+| 9000B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-ip4base-ndrpdr
+| 9000B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-ip4base-ndrpdr
+| 9000B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-ip4base-ndrpdr
+| IMIX-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-ip4base-ndrpdr
+| IMIX-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-ip4base-ndrpdr
+| IMIX-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
index 981298168f..92cb43e487 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
@@ -96,50 +96,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index ee11de1324..bb205b0bd7 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index 3631a7494e..ebf398a889 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index e0208db5b2..4e717d3c35 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -88,50 +88,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ndrpdr
+| 64B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-ndrpdr
+| 64B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-ndrpdr
+| 64B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-ndrpdr
+| 1518B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-ndrpdr
+| 1518B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-ndrpdr
+| 1518B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-ndrpdr
+| 9000B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-ndrpdr
+| 9000B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-ndrpdr
+| 9000B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-ndrpdr
+| IMIX-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-ndrpdr
+| IMIX-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-ndrpdr
+| IMIX-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index 194cdf5d77..772e37251f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale200k-ndrpdr
+| 64B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale200k-ndrpdr
+| 64B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale200k-ndrpdr
+| 64B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale200k-ndrpdr
+| 1518B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale200k-ndrpdr
+| 1518B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale200k-ndrpdr
+| 1518B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale200k-ndrpdr
+| 9000B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale200k-ndrpdr
+| 9000B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale200k-ndrpdr
+| 9000B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale200k-ndrpdr
+| IMIX-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale200k-ndrpdr
+| IMIX-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale200k-ndrpdr
+| IMIX-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index 5edc8eeadb..9ddf17641b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale20k-ndrpdr
+| 64B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale20k-ndrpdr
+| 64B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale20k-ndrpdr
+| 64B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale20k-ndrpdr
+| 1518B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale20k-ndrpdr
+| 1518B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale20k-ndrpdr
+| 1518B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale20k-ndrpdr
+| 9000B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale20k-ndrpdr
+| 9000B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale20k-ndrpdr
+| 9000B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale20k-ndrpdr
+| IMIX-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale20k-ndrpdr
+| IMIX-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale20k-ndrpdr
+| IMIX-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index 7499d08ebc..9bc5bbd170 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale2m-ndrpdr
+| 64B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale2m-ndrpdr
+| 64B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale2m-ndrpdr
+| 64B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale2m-ndrpdr
+| 1518B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale2m-ndrpdr
+| 1518B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale2m-ndrpdr
+| 1518B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale2m-ndrpdr
+| 9000B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale2m-ndrpdr
+| 9000B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale2m-ndrpdr
+| 9000B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale2m-ndrpdr
+| IMIX-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale2m-ndrpdr
+| IMIX-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale2m-ndrpdr
+| IMIX-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
index 49fe0714b4..4b1f1c12ba 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
index 1bf1cd7859..1a0a916bee 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
index 8d5daac721..b9d4de5757 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
index e4b5a54c08..eb1d39fb7a 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
index 3dad430458..a1015bc158 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
index 8341a99c4d..f89667cc13 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
index e01cb37bce..4cefdb0bc8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
index 0ee14b7387..64a51ff17b 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index b6b1322177..d086ad7874 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
index 12654eb7fb..44ecc3e037 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
index deb140e8ee..72c6caabf6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index a8ec3db4f6..e954732ce0 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
index bbb9252007..1c1072f598 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
index 476ea1ee11..26ddc115cc 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index 06b817b2ec..d00205b7ef 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
index ec7f3eb869..4b36dd0df4 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
index c34a95156a..7a173b6e25 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index 068debf2f8..bbb8f9a910 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index faeb8029d5..dacda0c070 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
index 36e9179bf1..a23782b1d3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
index e9c18dbd78..3775559661 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
index a2f7573df4..ef1c4a03e6 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
index a18e3f3070..8590f94312 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
index 757dcd3780..48579810cb 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
index dd41842dd5..f9e76a65c3 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
index 50c2860be0..8db59749df 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
index 64ca783847..1dc94bab9d 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
index be48eb4e42..62b66bbbef 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
index 92ab38c90b..b250b7e288 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
index 0c3922ef30..af63786dbe 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
index a2f8a36370..f0ae0ae0cd 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
index 814e222803..0236f95ecf 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
index 984e58a4f6..ced27feacd 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index efed1e8148..fd98097d42 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
index 44b26d52da..249a4507b8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
index 92f703a8ef..1be35bad25 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index c68e4db364..51cae504ee 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
index b2068c4b62..45c75eb552 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
index 951e28faba..2e1a291b67 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
index 0af2247070..0c6f93be05 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
index af922161e1..4fcb7dc9ba 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
index c20f1e2082..0dbcf3ede8 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
index 7a4fe86664..5569942819 100644
--- a/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x710-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
index 587bd61230..db76282b5e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-ip4base-ndrpdr
+| 64B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-ip4base-ndrpdr
+| 64B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-ip4base-ndrpdr
+| 64B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-ip4base-ndrpdr
+| 1518B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-ip4base-ndrpdr
+| 1518B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-ip4base-ndrpdr
+| 1518B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-ip4base-ndrpdr
+| 9000B-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-ip4base-ndrpdr
+| 9000B-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-ip4base-ndrpdr
+| 9000B-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-ip4base-ndrpdr
+| IMIX-1c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-ip4base-ndrpdr
+| IMIX-2c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-ip4base-ndrpdr
+| IMIX-4c-dot1q-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
index 6e13d61981..914d57d509 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-copwhtlistbase-ndrpdr.robot
@@ -92,50 +92,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 64B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
index 4744a3db89..492fb03fe8 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-iacldstbase-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 64B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-iacldstbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
index 344f48d8c3..1b18e5a7a6 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ipolicemarkbase-ndrpdr.robot
@@ -96,50 +96,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 64B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 1518B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| 9000B-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-1c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-2c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
+| IMIX-4c-ethip4-ip4base-ipolicemarkbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
index 8267e527ad..80ffa072aa 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4base-ndrpdr.robot
@@ -87,50 +87,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-ndrpdr
+| 64B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-ndrpdr
+| 64B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-ndrpdr
+| 64B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-ndrpdr
+| 1518B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-ndrpdr
+| 1518B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-ndrpdr
+| 1518B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-ndrpdr
+| 9000B-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-ndrpdr
+| 9000B-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-ndrpdr
+| 9000B-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-ndrpdr
+| IMIX-1c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-ndrpdr
+| IMIX-2c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-ndrpdr
+| IMIX-4c-ethip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
index a97a4bba0d..39ef35dcaf 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale200k-ndrpdr
+| 64B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale200k-ndrpdr
+| 64B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale200k-ndrpdr
+| 64B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale200k-ndrpdr
+| 1518B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale200k-ndrpdr
+| 1518B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale200k-ndrpdr
+| 1518B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale200k-ndrpdr
+| 9000B-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale200k-ndrpdr
+| 9000B-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale200k-ndrpdr
+| 9000B-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale200k-ndrpdr
+| IMIX-1c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale200k-ndrpdr
+| IMIX-2c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale200k-ndrpdr
+| IMIX-4c-ethip4-ip4scale200k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-rnd-ndrpdr.robot
index 4095fc6f7d..2e28c5c630 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale200k-rnd-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale200k-rnd-ndrpdr
+| 64B-1c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale200k-rnd-ndrpdr
+| 64B-2c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale200k-rnd-ndrpdr
+| 64B-4c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale200k-rnd-ndrpdr
+| 1518B-1c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale200k-rnd-ndrpdr
+| 1518B-2c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale200k-rnd-ndrpdr
+| 1518B-4c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale200k-rnd-ndrpdr
+| 9000B-1c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale200k-rnd-ndrpdr
+| 9000B-2c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale200k-rnd-ndrpdr
+| 9000B-4c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale200k-rnd-ndrpdr
+| IMIX-1c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale200k-rnd-ndrpdr
+| IMIX-2c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale200k-rnd-ndrpdr
+| IMIX-4c-ethip4-ip4scale200k-rnd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
index 136f9d2d5e..c370f76ff7 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale20k-ndrpdr
+| 64B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale20k-ndrpdr
+| 64B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale20k-ndrpdr
+| 64B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale20k-ndrpdr
+| 1518B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale20k-ndrpdr
+| 1518B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale20k-ndrpdr
+| 1518B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale20k-ndrpdr
+| 9000B-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale20k-ndrpdr
+| 9000B-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale20k-ndrpdr
+| 9000B-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale20k-ndrpdr
+| IMIX-1c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale20k-ndrpdr
+| IMIX-2c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale20k-ndrpdr
+| IMIX-4c-ethip4-ip4scale20k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-rnd-ndrpdr.robot
index 8fc019f47b..d13a3e18bf 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale20k-rnd-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale20k-rnd-ndrpdr
+| 64B-1c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale20k-rnd-ndrpdr
+| 64B-2c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale20k-rnd-ndrpdr
+| 64B-4c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale20k-rnd-ndrpdr
+| 1518B-1c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale20k-rnd-ndrpdr
+| 1518B-2c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale20k-rnd-ndrpdr
+| 1518B-4c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale20k-rnd-ndrpdr
+| 9000B-1c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale20k-rnd-ndrpdr
+| 9000B-2c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale20k-rnd-ndrpdr
+| 9000B-4c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale20k-rnd-ndrpdr
+| IMIX-1c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale20k-rnd-ndrpdr
+| IMIX-2c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale20k-rnd-ndrpdr
+| IMIX-4c-ethip4-ip4scale20k-rnd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
index 15931f6362..be3963d7b1 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale2m-ndrpdr
+| 64B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale2m-ndrpdr
+| 64B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale2m-ndrpdr
+| 64B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale2m-ndrpdr
+| 1518B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale2m-ndrpdr
+| 1518B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale2m-ndrpdr
+| 1518B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale2m-ndrpdr
+| 9000B-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale2m-ndrpdr
+| 9000B-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale2m-ndrpdr
+| 9000B-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale2m-ndrpdr
+| IMIX-1c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale2m-ndrpdr
+| IMIX-2c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale2m-ndrpdr
+| IMIX-4c-ethip4-ip4scale2m-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-rnd-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-rnd-ndrpdr.robot
index aebd98a1dc..7852e6e49a 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-rnd-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4-ip4scale2m-rnd-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4scale2m-rnd-ndrpdr
+| 64B-1c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4scale2m-rnd-ndrpdr
+| 64B-2c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4scale2m-rnd-ndrpdr
+| 64B-4c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4scale2m-rnd-ndrpdr
+| 1518B-1c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4scale2m-rnd-ndrpdr
+| 1518B-2c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4scale2m-rnd-ndrpdr
+| 1518B-4c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4scale2m-rnd-ndrpdr
+| 9000B-1c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4scale2m-rnd-ndrpdr
+| 9000B-2c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4scale2m-rnd-ndrpdr
+| 9000B-4c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4scale2m-rnd-ndrpdr
+| IMIX-1c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4scale2m-rnd-ndrpdr
+| IMIX-2c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4scale2m-rnd-ndrpdr
+| IMIX-4c-ethip4-ip4scale2m-rnd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
index 494d9d2df0..1d274cabaf 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
index 440dfbd845..9aaab5bb27 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
index dc2bf64bd8..ee69644b24 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
index 8ade1089b9..9a3fefcfa1 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
index 862c1a6968..7b0e570cb0 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-nat44-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
index f9db8c2fd8..82644f2320 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
index 761c157e0e..fd5fc4cbe3 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 64B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 1518B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| 9000B-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-1c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-2c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
+| IMIX-4c-ethip4udp-ip4base-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
index 9067024dde..0b89c27291 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 64B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 1518B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| 9000B-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-1c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-2c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
+| IMIX-4c-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
-- 
cgit 1.2.3-korg