From be5265bc9612f5aedf4f25720c4bd8941e359410 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
Date: Fri, 22 May 2020 14:25:24 +0200
Subject: [PATCH] Remove leading tc[nn] from test names
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
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>
---
 resources/libraries/bash/entry/check/tc_naming.sh  | 12 +++++------
 resources/libraries/python/autogen/Regenerator.py  | 10 ++++-----
 resources/libraries/python/autogen/Testcase.py     | 12 ++++-------
 .../10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot  | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot  | 24 +++++++++++-----------
 ...l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot | 24 +++++++++++-----------
 ...eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot |  2 +-
 ...thipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot |  2 +-
 ...th2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot |  2 +-
 ...eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot |  2 +-
 ...nlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot |  2 +-
 ...nlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot |  2 +-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |  2 +-
 ...p4base-policy-aes-128-cbc-sha-512-256-dev.robot |  2 +-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |  2 +-
 ...p6base-policy-aes-128-cbc-sha-512-256-dev.robot |  2 +-
 .../eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot     |  2 +-
 ...-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot |  2 +-
 ...eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot |  2 +-
 .../eth2p-ethip4-ip4base-copblklistbase-dev.robot  |  2 +-
 .../eth2p-ethip4-ip4base-copwhtlistbase-dev.robot  |  2 +-
 .../ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot |  2 +-
 .../eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot |  2 +-
 .../vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot |  2 +-
 .../eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot     |  2 +-
 .../eth2p-ethip4vxlan-l2xcbase-dev.robot           |  2 +-
 .../lisp/eth2p-ethip4lisp-ip4base-dev.robot        |  2 +-
 .../lisp/eth2p-ethip4lispgpe-ip4base-dev.robot     |  2 +-
 .../lisp/eth2p-ethip4lispgpe-ip6base-dev.robot     |  2 +-
 .../eth2p-ethip6-ip6base-copblklistbase-dev.robot  |  2 +-
 .../eth2p-ethip6-ip6base-copwhtlistbase-dev.robot  |  2 +-
 .../ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot |  2 +-
 .../eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot |  2 +-
 .../vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot |  2 +-
 .../lisp/eth2p-ethip6lispgpe-ip4base-dev.robot     |  2 +-
 .../lisp/eth2p-ethip6lispgpe-ip6base-dev.robot     |  2 +-
 .../eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot   |  2 +-
 .../eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot    |  2 +-
 .../l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot    |  2 +-
 .../device/l2patch/eth2p-ethip4-l2patch-dev.robot  |  2 +-
 .../device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot   |  2 +-
 .../eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot  |  2 +-
 ...h2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot |  2 +-
 ...6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot |  2 +-
 ...2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot |  2 +-
 ...p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot |  2 +-
 ...p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot |  2 +-
 .../eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot |  2 +-
 .../eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot |  2 +-
 ...ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot |  2 +-
 ...eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot |  2 +-
 ...t1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot | 24 +++++++++++-----------
 ...1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot | 24 +++++++++++-----------
 ...710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...t1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot | 24 +++++++++++-----------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...ec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...ec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...sec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...sec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...sec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...sec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...sec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...sec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...p4base-policy-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...sec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...sec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...ec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...ec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...ec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...ec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...psec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...psec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...sec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...sec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac256sha-reconf.robot | 18 ++++++++--------
 ...l-ip4base-int-aes128cbc-hmac512sha-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot | 18 ++++++++--------
 ...0tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...w-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot | 18 ++++++++--------
 ...ec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot | 18 ++++++++--------
 ...ec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...spgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot | 18 ++++++++--------
 ...1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot |  2 +-
 ...-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot |  2 +-
 ...th-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot |  2 +-
 ...4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot |  2 +-
 ...0ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot |  2 +-
 ...10-eth-ip4udpquicscale10cl10s-vppecho-bps.robot |  2 +-
 ...710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot |  2 +-
 ...710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot |  2 +-
 .../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 +++++++++++-----------
 ...an-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot | 24 +++++++++++-----------
 ...vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot | 24 +++++++++++-----------
 ...vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot | 24 +++++++++++-----------
 ...ip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot  | 24 +++++++++++-----------
 .../ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot     | 24 +++++++++++-----------
 ...x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 24 +++++++++++-----------
 .../ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot    | 24 +++++++++++-----------
 .../10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot   | 24 +++++++++++-----------
 .../10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot    | 24 +++++++++++-----------
 .../ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot | 24 +++++++++++-----------
 .../2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot    | 24 +++++++++++-----------
 ...x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot | 24 +++++++++++-----------
 .../2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot   | 24 +++++++++++-----------
 ...1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot | 24 +++++++++++-----------
 ...n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot | 24 +++++++++++-----------
 ...2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot | 24 +++++++++++-----------
 .../l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot    | 24 +++++++++++-----------
 .../10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot  | 24 +++++++++++-----------
 .../l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot     | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...basemaclrn-macip-iacl10sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...asemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...basemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...dbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...basemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...dbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...basemaclrn-macip-iacl50sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...asemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...basemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 .../l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...th-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot | 24 +++++++++++-----------
 ...-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...h-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot | 24 +++++++++++-----------
 ...0ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 ...10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 .../10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 .../perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot   | 24 +++++++++++-----------
 .../perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot  | 24 +++++++++++-----------
 ...ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot | 24 +++++++++++-----------
 ...l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot | 24 +++++++++++-----------
 .../2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot   | 24 +++++++++++-----------
 ...n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot | 24 +++++++++++-----------
 ...0ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 ...10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 ...-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot | 24 +++++++++++-----------
 .../l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot   | 24 +++++++++++-----------
 .../l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot  | 24 +++++++++++-----------
 ...e2p1x710-ethip4-loadbalancer-l3dsr-ndrpdr.robot | 24 +++++++++++-----------
 ...2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot | 24 +++++++++++-----------
 ...ge2p1x710-ethip4-loadbalancer-nat4-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...10-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...0-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...d-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot | 18 ++++++++--------
 ...eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...0-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...0-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...10-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...0-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...0-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...0-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...10-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...10-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...10-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot | 16 +++++++--------
 ...l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...xlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...xlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...an-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...an-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...an-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...an-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...an-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...an-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...p4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...n-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...n-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot | 24 +++++++++++-----------
 ...n-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...n-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot | 24 +++++++++++-----------
 ...x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot | 24 +++++++++++-----------
 ...-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot | 24 +++++++++++-----------
 ...hip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot | 24 +++++++++++-----------
 ...ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot | 24 +++++++++++-----------
 ...thip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot | 24 +++++++++++-----------
 ...thip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...p4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...clrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...ot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...base-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...aclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...clrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...cbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...base-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot | 24 +++++++++++-----------
 ...thip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...p4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr.robot | 24 +++++++++++-----------
 ...dstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 ...iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot | 24 +++++++++++-----------
 563 files changed, 5670 insertions(+), 5678 deletions(-)

diff --git a/resources/libraries/bash/entry/check/tc_naming.sh b/resources/libraries/bash/entry/check/tc_naming.sh
index 2a084d9669..e9f86fc0dd 100644
--- a/resources/libraries/bash/entry/check/tc_naming.sh
+++ b/resources/libraries/bash/entry/check/tc_naming.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright (c) 2019 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -28,12 +28,12 @@ source "${BASH_FUNCTION_DIR}/common.sh" || {
     exit 1
 }
 
-# Grep of interest: We want all tc01- prefixed (skip TC variations for now).
+# Grep of interest: We want all [0-9]{2,4}B- or IMIX- prefixed.
 # Currently script assumes all variations inside to be part of either
 # auto-generation or not checked at all (VIRL derivates).
-r_grep="tc01-"
+r_grep="([0-9]{2,4}B|IMIX)-"
 # Parse grep of interest (learn path, learn suite, learn testcase name).
-r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)'
+r_parse='(.*)\/(.*).robot.*(([0-9]{2,4}B|IMIX)-.*)'
 
 # CSIT Testcase naming convention rules.
 # https://wiki.fd.io/view/CSIT/csit-test-naming
@@ -48,7 +48,6 @@ r_parse='(.*)\/(.*).robot.*(tc[[:digit:]]{2}-.*)'
 # One caveat of this solution is that we cannot proceed to check full names now
 # as majority of Testcases does not meet naming criteria.
 s_testc_rules=(
-    'TC id'
     'packet size'
     'core combination'
     'NIC driver mode'
@@ -56,8 +55,7 @@ s_testc_rules=(
     'test type'
     )
 r_testc_rules=(
-    '^tc[[:digit:]]{2}-'
-    '([[:digit:]]{2,4}B|IMIX)-'
+    '^([[:digit:]]{2,4}B|IMIX)-'
     '([[:digit:]]+c-){0,1}'
     '(avf-|1lbvpplacp-|2lbvpplacp-){0,1}'
     '(eth|dot1q|dot1ad)'
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 3ef589d351..0d291e231e 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -130,9 +130,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
     :type file_out: file
     :type tc_kwargs_list: dict
     """
-    # We bump tc number in any case, so that future enables/disables
-    # do not affect the numbering of other test cases.
-    for num, kwargs in enumerate(tc_kwargs_list, start=1):
+    for kwargs in tc_kwargs_list:
         # TODO: Is there a better way to disable some combinations?
         emit = True
         if kwargs[u"frame_size"] == 9000:
@@ -163,7 +161,7 @@ def add_default_testcases(testcase, iface, suite_id, file_out, tc_kwargs_list):
             if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES:
                 emit = False
         if emit:
-            file_out.write(testcase.generate(num=num, **kwargs))
+            file_out.write(testcase.generate(**kwargs))
 
 
 def add_tcp_testcases(testcase, file_out, tc_kwargs_list):
@@ -176,8 +174,8 @@ def add_tcp_testcases(testcase, file_out, tc_kwargs_list):
     :type file_out: file
     :type tc_kwargs_list: dict
     """
-    for num, kwargs in enumerate(tc_kwargs_list, start=1):
-        file_out.write(testcase.generate(num=num, **kwargs))
+    for kwargs in tc_kwargs_list:
+        file_out.write(testcase.generate(**kwargs))
 
 
 def write_default_files(in_filename, in_prolog, kwargs_list):
diff --git a/resources/libraries/python/autogen/Testcase.py b/resources/libraries/python/autogen/Testcase.py
index c4ed60685b..3ffbc4594a 100644
--- a/resources/libraries/python/autogen/Testcase.py
+++ b/resources/libraries/python/autogen/Testcase.py
@@ -29,21 +29,18 @@ class Testcase:
             - cores_str - Number of physical cores to use, example: "2".
             - frame_num - Framesize as a number, example: "${74}".
             - frame_str - Framesize in upper case, example: "74B".
-            - tc_num - Start of testcase name, example: "tc04".
         :type template_string: str
         """
         self.template = Template(template_string)
 
-    def generate(self, num, frame_size, phy_cores):
+    def generate(self, frame_size, phy_cores):
         """Return string of test case code with placeholders filled.
 
         Fail if there are placeholders left unfilled.
         It is not required for all placeholders to be present in template.
 
-        :param num: Test case number. Example value: 4.
         :param frame_size: Imix string or numeric frame size. Example: 74.
         :param phy_cores: Number of physical cores to use. Example: 2.
-        :type num: int
         :type frame_size: str or int
         :type phy_cores: int or str
         :returns: Filled template, usable as test case code.
@@ -66,7 +63,6 @@ class Testcase:
             {
                 u"cores_num": f"${{{cores_num:d}}}",
                 u"cores_str": phy_cores,
-                u"tc_num": f"tc{num:02d}",
             }
         )
         return self.template.substitute(subst_dict)
@@ -84,7 +80,7 @@ class Testcase:
         :rtype: Testcase
         """
         template_string = f'''
-| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id}
+| ${{frame_str}}-${{cores_str}}c-{suite_id}
 | | [Tags] | ${{frame_str}} | ${{cores_str}}C
 | | frame_size=${{frame_num}} | phy_cores=${{cores_num}}
 '''
@@ -105,13 +101,13 @@ class Testcase:
         # (TCP, QUIC, SCTP, ...) where DUT (not TG) decides frame size.
         if u"tcphttp" in suite_id:
             template_string = f'''
-| ${{tc_num}}-IMIX-${{cores_str}}c-{suite_id}
+| IMIX-${{cores_str}}c-{suite_id}
 | | [Tags] | ${{cores_str}}C
 | | phy_cores=${{cores_num}}
 '''
         else:
             template_string = f'''
-| ${{tc_num}}-${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]}
+| ${{frame_str}}-${{cores_str}}c-{suite_id[:-4]}-{suite_id[-3:]}
 | | [Tags] | ${{cores_str}}C\n| | phy_cores=${{cores_num}}
 '''
         return cls(template_string)
diff --git a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 15842294de..5f3807b448 100644
--- a/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -75,50 +75,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 92a9fc3f4f..0a69d543ac 100644
--- a/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -75,50 +75,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
index 39c74a9e7c..4d1e7043cd 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-eth-l2xcbase-testpmd-ndrpdr.robot
@@ -75,50 +75,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 64B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 1518B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-testpmd-ndrpdr
+| 9000B-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-1c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-2c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
+| IMIX-4c-eth-l2xcbase-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
index 2750e7ab88..8d2b3cc407 100644
--- a/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
+++ b/tests/dpdk/perf/2n1l-10ge2p1x710-ethip4-ip4base-l3fwd-ndrpdr.robot
@@ -75,50 +75,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 64B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 1518B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
+| 9000B-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-1c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-2c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
+| IMIX-4c-ethip4-ip4base-l3fwd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot
index a6980b697e..e1773b0351 100644
--- a/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-ip4base-eth-2memif-1dcr-dev.robot
@@ -84,6 +84,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-ip4base-eth-2memif-1dcr-dev
+| 64B-ethipv4-ip4base-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
index c3ee371c59..833e7b0c4c 100644
--- a/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev.robot
@@ -82,6 +82,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev
+| 64B-ethipv4-l2bdbasemaclrn-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot
index 2a4ee83a61..ea46e7d2dd 100644
--- a/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv4-l2xcbase-eth-2memif-1dcr-dev.robot
@@ -81,6 +81,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2xcbase-eth-2memif-1dcr-dev
+| 64B-ethipv4-l2xcbase-eth-2memif-1dcr-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
index 885fd16f12..a067bbcbe3 100644
--- a/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
+++ b/tests/vpp/device/container_memif/eth2p-ethipv6-ip6base-eth-2memif-1dcr-dev.robot
@@ -114,6 +114,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-78B-ethipv6-ip6base-eth-2memif-1dcr-dev
+| 78B-ethipv6-ip6base-eth-2memif-1dcr-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
index 325c67ba21..2c5600590c 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec11tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
@@ -96,6 +96,6 @@
 | | ... | ${tun_if1_ip4} | ${tun_if2_ip4}
 
 *** Test Cases ***
-| tc01-154B-ethip4ipsec11tnlsw-ip4base-int-aes-128-cbc-sha-512-256-dev
+| 154B-ethip4ipsec11tnlsw-ip4base-int-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 154B
 | | frame_size=${154} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
index 8d89dcda5c..835d86451f 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-dev.robot
@@ -96,6 +96,6 @@
 | | ... | ${tun_if1_ip4} | ${tun_if2_ip4}
 
 *** Test Cases ***
-| tc01-154B-ethip4ipsec1tnlsw-ip4base-int-aes-128-cbc-sha-512-256-dev
+| 154B-ethip4ipsec1tnlsw-ip4base-int-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 154B
 | | frame_size=${154} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 03d9ecf6c0..2c24b9afa2 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -98,6 +98,6 @@
 | | ... | ${dut_tun_ip}
 
 *** Test Cases ***
-| tc01-110B-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev
+| 110B-ethip4ipsec1tnlsw-ip4base-policy-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 110B
 | | frame_size=${110} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
index 6f65556cbb..24025fed34 100644
--- a/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -96,6 +96,6 @@
 | | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip}
 
 *** Test Cases ***
-| tc01-110B-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev
+| 110B-ethip4ipsec1tptsw-ip4base-policy-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 110B
 | | frame_size=${110} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index 406cdae7f8..5acc830d01 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -99,6 +99,6 @@
 | | ... | ${dut_tun_ip}
 
 *** Test Cases ***
-| tc01-124B-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev
+| 124B-ethip6ipsec1tnlsw-ip6base-policy-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 124B
 | | frame_size=${124} | phy_cores=${0}
diff --git a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
index 0b2e65cd7f..e11d1b9bd7 100644
--- a/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
+++ b/tests/vpp/device/crypto/eth2p-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev.robot
@@ -98,6 +98,6 @@
 | | ... | ${dut_spi} | ${tg_src_ip} | ${tg_dst_ip}
 
 *** Test Cases ***
-| tc01-124B-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev
+| 124B-ethip6ipsec1tptsw-ip6base-policy-aes-128-cbc-sha-512-256-dev
 | | [Tags] | 124B
 | | frame_size=${124} | phy_cores=${0}
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
index a3075e57d5..6e86a70ba1 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-dev.robot
@@ -99,6 +99,6 @@
 | | ... | ${tap1_NM_ip} | ${tg_ip_address}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-eth-1tap-dev
+| 64B-ethicmpv4-ip4base-eth-1tap-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
index 852d687edb..88bd61e25d 100644
--- a/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethicmpv4-ip4base-eth-1tap-namespace-dev.robot
@@ -105,6 +105,6 @@
 | | ... | ${tap1_NM_ip} | ${tg_ip_address}
 
 *** Test Cases ***
-| tc01-64B-ethicmpv4-ip4base-eth-1tap-namespace-dev
+| 64B-ethicmpv4-ip4base-eth-1tap-namespace-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot
index 5a1b6a68b8..93c6d8d73e 100644
--- a/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot
+++ b/tests/vpp/device/interfaces/eth2p-ethipv4-l2bdbasemaclrn-eth-2tap-dev.robot
@@ -88,6 +88,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2tap-dev
+| 64B-ethipv4-l2bdbasemaclrn-eth-2tap-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
index 08247008a6..ee9a2f8930 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copblklistbase-dev.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-copblklistbase-dev
+| 64B-ethip4-ip4base-copblklistbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
index 2482883d77..a9713e8a98 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-copwhtlistbase-dev.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-copwhtlistbase-dev
+| 64B-ethip4-ip4base-copwhtlistbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
index ba9235f7ae..b34ad495ee 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-iacldstbase-dev.robot
@@ -85,6 +85,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-iacldstbase-dev
+| 64B-ethip4-ip4base-iacldstbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
index 13665cd9a2..866975cbc5 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4-ip4base-ipolicemarkbase-dev.robot
@@ -85,6 +85,6 @@
 | | ... | 10.10.10.2 | 20.20.20.2
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-ipolicemarkbase-dev
+| 64B-ethip4-ip4base-ipolicemarkbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
index 7105b28fa0..8e4997ab67 100644
--- a/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethipv4-ip4base-dev.robot
@@ -78,6 +78,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-ip4base-dev
+| 64B-ethipv4-ip4base-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
index a507325dc8..0d9607129a 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2bdbasemaclrn-dev.robot
@@ -80,6 +80,6 @@
 | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0}
 
 *** Test Cases ***
-| tc01-114B-ethip4vxlan-l2bdbasemaclrn-dev
+| 114B-ethip4vxlan-l2bdbasemaclrn-dev
 | | [Tags] | 114B
 | | frame_size=${114} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
index 97a1ca13dc..beff215e8f 100644
--- a/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/eth2p-ethip4vxlan-l2xcbase-dev.robot
@@ -79,6 +79,6 @@
 | | ... | 172.17.0.2 | 172.16.0.1 | ${0} | 172.26.0.1 | 172.27.0.2 | ${0}
 
 *** Test Cases ***
-| tc01-114B-ethip4vxlan-l2xcbase-dev
+| 114B-ethip4vxlan-l2xcbase-dev
 | | [Tags] | 114B
 | | frame_size=${114} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
index 70b80c0353..49a852ccee 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-dev.robot
@@ -86,6 +86,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4}
 
 *** Test Cases ***
-| tc01-46B-ethip4lisp-ip4base-dev
+| 46B-ethip4lisp-ip4base-dev
 | | [Tags] | 46B
 | | frame_size=${46} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
index 7892553871..0c2f04cb5a 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-dev.robot
@@ -87,6 +87,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4}
 
 *** Test Cases ***
-| tc01-46B-ethip4lispgpe-ip4base-dev
+| 46B-ethip4lispgpe-ip4base-dev
 | | [Tags] | 46B
 | | frame_size=${46} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
index ac901b18ba..78e1139465 100644
--- a/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-dev.robot
@@ -89,6 +89,6 @@
 | | ... | ${src_rloc4} | ${dst_rloc4} | ${ot_mode}
 
 *** Test Cases ***
-| tc01-62B-ethip4lispgpe-ip6base-dev
+| 62B-ethip4lispgpe-ip6base-dev
 | | [Tags] | 62B
 | | frame_size=${62} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
index b06cfab70b..2da1a1080a 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copblklistbase-dev.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-78B-ethip6-ip6base-copblklistbase-dev
+| 78B-ethip6-ip6base-copblklistbase-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
index 3cc3dfa47e..e73f896312 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-copwhtlistbase-dev.robot
@@ -81,6 +81,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-78B-ethip6-ip6base-copwhtlistbase-dev
+| 78B-ethip6-ip6base-copwhtlistbase-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
index 7ef550aa99..7d64477be5 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-iacldstbase-dev.robot
@@ -85,6 +85,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-78B-ethip6-ip6base-iacldstbase-dev
+| 78B-ethip6-ip6base-iacldstbase-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
index af8eb75489..02b8728f3d 100644
--- a/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethip6-ip6base-ipolicemarkbase-dev.robot
@@ -82,6 +82,6 @@
 | | ... | 2001:1::2 | 2001:2::2
 
 *** Test Cases ***
-| tc01-78B-ethip6-ip6base-ipolicemarkbase-dev
+| 78B-ethip6-ip6base-ipolicemarkbase-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
index 14790ff3e0..752cc80f1d 100644
--- a/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
+++ b/tests/vpp/device/ip6/eth2p-ethipv6-ip6base-dev.robot
@@ -78,6 +78,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-78B-ethipv6-ip6base-dev
+| 78B-ethipv6-ip6base-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
index 6ee31292f4..c2f01c3b03 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-dev.robot
@@ -88,6 +88,6 @@
 | | ... | ${src_rloc6} | ${dst_rloc6} | ${ot_mode}
 
 *** Test Cases ***
-| tc01-46B-ethip6lispgpe-ip4base-dev
+| 46B-ethip6lispgpe-ip4base-dev
 | | [Tags] | 46B
 | | frame_size=${46} | phy_cores=${0}
diff --git a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
index e8ef624065..7266e48885 100644
--- a/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
+++ b/tests/vpp/device/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6base-dev.robot
@@ -87,6 +87,6 @@
 | | ... | ${src_rloc6} | ${dst_rloc6}
 
 *** Test Cases ***
-| tc01-62B-ethip6lispgpe-ip6base-dev
+| 62B-ethip6lispgpe-ip6base-dev
 | | [Tags] | 62B
 | | frame_size=${62} | phy_cores=${0}
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
index bee7330174..5c10713ba0 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1q-l2bdbasemaclrn-gbp-dev.robot
@@ -90,6 +90,6 @@
 | | ... | traffic_script=send_ip_check_headers
 
 *** Test Cases ***
-| tc01-64B-avf-dot1q-l2bdbasemaclrn-gbp-dev
+| 64B-avf-dot1q-l2bdbasemaclrn-gbp-dev
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
index 6c258af93d..e9c062a4a8 100644
--- a/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-avf-dot1qip4-l2bdbasemaclrn-dev.robot
@@ -78,6 +78,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-68B-avf-dot1qip4-l2bdbasemaclrn-dev
+| 68B-avf-dot1qip4-l2bdbasemaclrn-dev
 | | [Tags] | 68B
 | | frame_size=${68} | phy_cores=${0}
diff --git a/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot
index 4d24ddcda8..1735742f28 100644
--- a/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot
+++ b/tests/vpp/device/l2bd/eth2p-ethipv4-l2bdbasemaclrn-dev.robot
@@ -77,6 +77,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2bdbasemaclrn-dev
+| 64B-ethipv4-l2bdbasemaclrn-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/l2patch/eth2p-ethip4-l2patch-dev.robot b/tests/vpp/device/l2patch/eth2p-ethip4-l2patch-dev.robot
index 778be3e41d..8d5c679d53 100644
--- a/tests/vpp/device/l2patch/eth2p-ethip4-l2patch-dev.robot
+++ b/tests/vpp/device/l2patch/eth2p-ethip4-l2patch-dev.robot
@@ -76,6 +76,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-l2patch-dev
+| 64B-ethip4-l2patch-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot b/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot
index f192959495..fbaeb0b20a 100644
--- a/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot
+++ b/tests/vpp/device/l2xc/eth2p-ethipv4-l2xcbase-dev.robot
@@ -77,6 +77,6 @@
 | | ... | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2xcbase-dev
+| 64B-ethipv4-l2xcbase-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot
index 2b96ebc4ff..7c9b37b954 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6ip6-ip6base-srv6enc1sid-dev.robot
@@ -98,6 +98,6 @@
 | | ... | ${dut1_sid1} | ${dut1_sid2} | ${dut2_sid2} | ${dut2_sid1}
 
 *** Test Cases ***
-| tc01-78B-ethip6ip6-ip6base-srv6enc1sid-dev
+| 78B-ethip6ip6-ip6base-srv6enc1sid-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot
index 71618e5c0d..38ce990d90 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-dev.robot
@@ -102,6 +102,6 @@
 | | ... | ${dut1_sid2_2} | ${dut2_sid1_2}
 
 *** Test Cases ***
-| tc01-78B-ethip6srhip6-ip6base-srv6enc2sids-dev
+| 78B-ethip6srhip6-ip6base-srv6enc2sids-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot
index c8a66db69e..d78b9a0800 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev.robot
@@ -102,6 +102,6 @@
 | | ... | ${dut1_sid2_2} | ${dut2_sid1_2} | decap=${False}
 
 *** Test Cases ***
-| tc01-78B-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev
+| 78B-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot
index 80c145d111..0e62ae3ad3 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-dyn-dev.robot
@@ -116,6 +116,6 @@
 | | ... | tg_dstsid3=${out_sid1_2} | dut_dstsid3=${out_sid2_2}
 
 *** Test Cases ***
-| tc01-78B-ethip6srhip6-ip6base-srv6proxy-dyn-dev
+| 78B-ethip6srhip6-ip6base-srv6proxy-dyn-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot
index fce94a2808..f751b73016 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-masq-dev.robot
@@ -116,6 +116,6 @@
 | | ... | tg_dstsid3=${out_sid1_2} | dut_dstsid3=${out_sid2_2}
 
 *** Test Cases ***
-| tc01-78B-ethip6srhip6-ip6base-srv6proxy-masq-dev
+| 78B-ethip6srhip6-ip6base-srv6proxy-masq-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot
index 3c669b4f41..56b43a527e 100644
--- a/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot
+++ b/tests/vpp/device/srv6/eth2p-ethip6srhip6-ip6base-srv6proxy-stat-dev.robot
@@ -117,6 +117,6 @@
 | | ... | static_proxy=${True}
 
 *** Test Cases ***
-| tc01-78B-ethip6srhip6-ip6base-srv6proxy-stat-dev
+| 78B-ethip6srhip6-ip6base-srv6proxy-stat-dev
 | | [Tags] | 78B
 | | frame_size=${78} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot
index 7ceb0fae35..de34c1e19c 100644
--- a/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip4/eth2p-ethipv4-ip4base-eth-2vhost-1vm-dev.robot
@@ -90,6 +90,6 @@
 | | ... | ${TG_pf2}[0] | ${DUT1_vf2_mac}[0] | ${TG_pf2_mac}[0]
 
 *** Test Cases ***
-| tc01-64B-ethip4-ip4base-eth-2vhost-1vm-dev
+| 64B-ethip4-ip4base-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot
index 36286f2928..6db832f7f9 100644
--- a/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/ip6/eth2p-ethipv6-ip6base-eth-2vhost-1vm-dev.robot
@@ -91,6 +91,6 @@
 
 
 *** Test Cases ***
-| tc01-64B-ethipv6-ip6base-eth-2vhost-1vm-dev
+| 64B-ethipv6-ip6base-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
index c23af8bcdd..2f3eb28d32 100644
--- a/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2bd/eth2p-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev.robot
@@ -90,6 +90,6 @@
 | | ... | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev
+| 64B-ethipv4-l2bdbasemaclrn-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot
index 2cac2b1338..d84fe18f0f 100644
--- a/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot
+++ b/tests/vpp/device/vm_vhost/l2xc/eth2p-ethipv4-l2xcbase-eth-2vhost-1vm-dev.robot
@@ -88,6 +88,6 @@
 | | ... | ${TG_pf1}[0] | ${TG_pf2}[0]
 
 *** Test Cases ***
-| tc01-64B-ethipv4-l2xcbase-eth-2vhost-1vm-dev
+| 64B-ethipv4-l2xcbase-eth-2vhost-1vm-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index f21f6753a0..2e2550ccd3 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -103,50 +103,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
index 4ef2ecff8a..71908b8017 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 8e83ca3c25..1b7408d5a9 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
index fc6882b618..e9d662a1e4 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 827b942633..b2e749267b 100644
--- a/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index f8a2535254..6e24447cd1 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -103,50 +103,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
index 94ef391a36..abcc730021 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
index 5895ebad4b..b466ff438a 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
index 7ba8ed6a95..3df936da6f 100644
--- a/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
+++ b/tests/vpp/perf/container_memif/2n1l-10ge2p1x710-ethip4-ip4base-eth-2memif-1dcr-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2memif-1dcr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 3e060b6f4a..5e9d0f0e28 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 8fa54e517f..50223018a0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index dae9807b72..c3b8cdddaa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 511638c708..9b5587c700 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec10000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 2240cb8084..11f7216c5e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index f88dbab43e..8938f07012 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 45288e46e6..3fe6919f41 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 5d2833d469..f893816251 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 95b573265c..35b4db83d6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 9d82927113..d7284f5b72 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index f80d240b26..4c049a8e12 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index 210a0ccbb1..cee628bffe 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 7f106330a7..02cf19413b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index ae87782d92..3c77246a44 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index dde7353539..ed65e75e97 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index d98ddd2297..1fa11b357f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 903bac991a..d86d8a0b6f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index d983f5d5d7..b0da1adb8c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index c83479e931..da12849a36 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 1969e0bea2..a5bf73f5b9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec1000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index c13110bb3e..989a1fc5fa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index b4b280b47c..501decd1e6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 0aaba0e169..abe360df6e 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 21f72eb306..a7c18a2090 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 99d6ecb272..78274810c6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 3c68636976..041e714138 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index 0512ba255e..3970c3d6a0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -116,38 +116,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index b9b2b88fb2..6eabb42d82 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -116,38 +116,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 03487dd507..5c885a6a48 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 05d5f49779..f740a97de9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
index 6af80e99fc..6028d79190 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
index a359105b4b..8549badd5c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index c4391e3c88..9f8b7d6f01 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -111,38 +111,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index fd20d1826c..c3ebeb92c8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -111,38 +111,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
index 2922ce4d65..de84bbd0a7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 18d91180e4..2edb1f158b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -115,38 +115,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 6749f80c4e..96028f6cce 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 21a93d3c7c..8ae614bccb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 6aff405792..b9075a05e1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index cd20902a6b..b8c6b7bfa7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec1tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 95f1e491bf..a1f014ef0d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 495a904c57..4d4f46231d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index c93f8667ff..c8d89826cf 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 7c61ec0e26..b58bed127b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
index 9619599c76..2a46728385 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
index 945b1208cf..c7146dee18 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
index c0d0688d71..99f4b89604 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 84850b599b..4608c46b53 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index fc6c149e59..c7d6c0467a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 9a3383451a..a416ad7d92 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 6644160e90..3007eba1bb 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 5f3f0a5a6c..8ca2160da3 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec20000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index ed4d66bc5f..058642bd27 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 0c47103270..1420753fa6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 99251a8a69..e784a08e22 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 4f0d4a8070..2a272cca82 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 1cc3c90ba2..9eb76a47a0 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 0d6230cc29..b61b162ce8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 5dd2e9ab30..5209ca4892 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index badcad1923..87a3923f1c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec40000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index e95a40355f..0c142fefa8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index fdb3f52899..06de73a1f8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 86dbfdb8ea..a0fca30330 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index e01244c2fa..466e68d387 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 837cc65639..eeb7015ad8 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index acc3b784a3..b18a211792 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index ae0509f8b7..bea27e31ae 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 0d50a79b4e..9307fb0f99 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec400tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 23c1d073be..e7b6945ee6 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 9543f40b3a..81bacdc07d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index cfab9aea10..d65515627a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index e26eecd80e..2b9ccef1a7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index a2c0cfc532..4d83c70a0f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index f0fc6dbdb0..dab925c6e7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index ffb8fd5086..a39e00621d 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 16a544a4d0..56b51dbf01 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec40tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 14e70bb2fe..bcce0becb7 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 1bddbb5e2b..b186af1cd9 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 0185a204dc..70af906574 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 51da5d0e25..f3a3b16b13 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index bca7e4be1d..040531c813 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 161a1ff6d4..4a1a78c29a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index dc81378a9c..25e8d046cc 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 956afbfefa..cc3a1ff852 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec4tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 180a3c5675..fb427279a2 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index a0d5d65b8a..0356ed7592 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 96a35ce465..8084056e45 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 077d0600df..1e0d3cf5c5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 6ed5e448a6..45229714c4 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index fdf6ea2c47..1e03dc9cc1 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index 8b5d663bb6..1f367eef4c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 1b7cdc5465..98c1ec049a 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec5000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 5732bcb120..cc7015fe7b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index f2e61c952d..c2a6a92422 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 13c6572ca5..02bda2f618 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 3eacb0b2ad..c90fae920c 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
index 19c0b3099d..56bb62fb2b 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| 1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
+| IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac256sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
index 209783acd7..2efe71e914 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf.robot
@@ -120,38 +120,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| 1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
+| IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128cbc-hmac512sha-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
index ad10f72251..afd6363f83 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| 1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
+| IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes128gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
index 31a8be8155..124fd8a21f 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf.robot
@@ -121,38 +121,38 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 64B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| 1518B-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-1c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-2c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
+| IMIX-4c-ethip4ipsec60000tnlsw-1atnl-ip4base-int-aes256gcm-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
index 14670084ad..8e77b7e277 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
index 775625431c..7fc6dc7bfa 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr.robot
@@ -112,38 +112,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
index 9e3238eb9e..37efce99d5 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes128gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
index 574ecf7c07..7790d74eff 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-ip4base-int-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
index e856b6b8a6..6c640b6d13 100644
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr.robot
@@ -113,38 +113,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 64B-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 64B-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 64B-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 1518B-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 1518B-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| 1518B-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| IMIX-1c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| IMIX-2c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
+| IMIX-4c-ethip4ipsectptlispgpe-ip4base-aes128cbc-hmac256sha-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
index 4fb1ca4ba9..a8d7bf0aa0 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-ldpreload-iperf3-bps.robot
@@ -60,6 +60,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-1460B-1c-eth-ip4tcpbase-ldpreload-iperf3-bps
+| 1460B-1c-eth-ip4tcpbase-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
index 4fc23d11c0..f30c8d6985 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps.robot
@@ -62,6 +62,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-1460B-1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps
+| 1460B-1c-eth-ip4tcpbase-nsim-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
index 2889f2396e..9b2d0500ef 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps.robot
@@ -62,6 +62,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-1460B-1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps
+| 1460B-1c-eth-ip4tcpscale1cl10s-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
index f2218d2061..64144d10e9 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps.robot
@@ -64,6 +64,6 @@
 | | ... | Defered Failure From Hoststack Iperf3 Test Program
 
 *** Test Cases ***
-| tc01-1460B-1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps
+| 1460B-1c-eth-ip4tcpscale1cl10s-nsim-ldpreload-iperf3-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
index e9e66d078e..ff0cbb3271 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicbase-vppecho-bps.robot
@@ -61,6 +61,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-1280B-1c-eth-ip4udpquicbase-vppecho-bps
+| 1280B-1c-eth-ip4udpquicbase-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
index 2d6ccef859..7cef9aeac1 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl10s-vppecho-bps.robot
@@ -66,6 +66,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-1280B-1c-eth-ip4udpquicscale10cl10s-vppecho-bps
+| 1280B-1c-eth-ip4udpquicscale10cl10s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
index 3210ebcf78..ad0a7a7619 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale10cl1s-vppecho-bps.robot
@@ -65,6 +65,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-1280B-1c-eth-ip4udpquicscale10cl1s-vppecho-bps
+| 1280B-1c-eth-ip4udpquicscale10cl1s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
diff --git a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
index d91cea643b..a3662784b9 100644
--- a/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
+++ b/tests/vpp/perf/hoststack/10ge2p1x710-eth-ip4udpquicscale1cl10s-vppecho-bps.robot
@@ -65,6 +65,6 @@
 | | ... | Defered Failure From Hoststack VPP Echo Test Program
 
 *** Test Cases ***
-| tc01-1280B-1c-eth-ip4udpquicscale1cl10s-vppecho-bps
+| 1280B-1c-eth-ip4udpquicscale1cl10s-vppecho-bps
 | | [Tags] | 1C
 | | phy_cores=${1}
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}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
index 24ca8f269e..93d3dd8d80 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 64B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 64B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 64B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 1518B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 1518B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 1518B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 9000B-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 9000B-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| 9000B-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| IMIX-1c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| IMIX-2c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
+| IMIX-4c-dot1q--ethip4vxlan-l2bdscale100l2bd100vlan100vxlan-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
index 94314b03ab..a8cf87479e 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 64B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 64B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 64B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 1518B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 1518B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 1518B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 9000B-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 9000B-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| 9000B-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| IMIX-1c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| IMIX-2c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
+| IMIX-4c-dot1q--ethip4vxlan-l2bdscale10l2bd10vlan10vxlan-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
index 9b128eefa0..3e208a79aa 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 64B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 64B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 64B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 1518B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 1518B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 1518B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 9000B-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 9000B-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| 9000B-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| IMIX-1c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| IMIX-2c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
+| IMIX-4c-dot1q--ethip4vxlan-l2bdscale1kl2bd1kvlan1kvxlan-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
index dbbf29b228..828b4462bc 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr.robot
@@ -93,50 +93,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 64B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 64B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 64B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 1518B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 1518B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 1518B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 9000B-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 9000B-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| 9000B-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| IMIX-1c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| IMIX-2c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
+| IMIX-4c-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
index ff719d31ca..99d7af69f4 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip4-ip4base-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4lispip4-ip4base-ndrpdr
+| 64B-1c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4lispip4-ip4base-ndrpdr
+| 64B-2c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4lispip4-ip4base-ndrpdr
+| 64B-4c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4lispip4-ip4base-ndrpdr
+| 1518B-1c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4lispip4-ip4base-ndrpdr
+| 1518B-2c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4lispip4-ip4base-ndrpdr
+| 1518B-4c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4lispip4-ip4base-ndrpdr
+| 9000B-1c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4lispip4-ip4base-ndrpdr
+| 9000B-2c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4lispip4-ip4base-ndrpdr
+| 9000B-4c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4lispip4-ip4base-ndrpdr
+| IMIX-1c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4lispip4-ip4base-ndrpdr
+| IMIX-2c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4lispip4-ip4base-ndrpdr
+| IMIX-4c-ethip4lispip4-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
index 9f1b22504a..1acd74c5ee 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4lispip6-ip4base-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4lispip6-ip4base-ndrpdr
+| 64B-1c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4lispip6-ip4base-ndrpdr
+| 64B-2c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4lispip6-ip4base-ndrpdr
+| 64B-4c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4lispip6-ip4base-ndrpdr
+| 1518B-1c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4lispip6-ip4base-ndrpdr
+| 1518B-2c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4lispip6-ip4base-ndrpdr
+| 1518B-4c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4lispip6-ip4base-ndrpdr
+| 9000B-1c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4lispip6-ip4base-ndrpdr
+| 9000B-2c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4lispip6-ip4base-ndrpdr
+| 9000B-4c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4lispip6-ip4base-ndrpdr
+| IMIX-1c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4lispip6-ip4base-ndrpdr
+| IMIX-2c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4lispip6-ip4base-ndrpdr
+| IMIX-4c-ethip4lispip6-ip4base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
index a799da2488..73e6f01f5b 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 64B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 64B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 64B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
index 7633f4c027..ce7baa1592 100644
--- a/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip4_tunnels/10ge2p1x710-ethip4vxlan-l2xcbase-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4vxlan-l2xcbase-ndrpdr
+| 64B-1c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4vxlan-l2xcbase-ndrpdr
+| 64B-2c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4vxlan-l2xcbase-ndrpdr
+| 64B-4c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2xcbase-ndrpdr
+| 1518B-1c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2xcbase-ndrpdr
+| 1518B-2c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2xcbase-ndrpdr
+| 1518B-4c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2xcbase-ndrpdr
+| 9000B-1c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2xcbase-ndrpdr
+| 9000B-2c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2xcbase-ndrpdr
+| 9000B-4c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2xcbase-ndrpdr
+| IMIX-1c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2xcbase-ndrpdr
+| IMIX-2c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2xcbase-ndrpdr
+| IMIX-4c-ethip4vxlan-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index f29e162eea..7db0d240fa 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-dot1q-ip6base-ndrpdr.robot
@@ -96,50 +96,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-dot1q-ip6base-ndrpdr
+| 78B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-dot1q-ip6base-ndrpdr
+| 78B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-dot1q-ip6base-ndrpdr
+| 78B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-ip6base-ndrpdr
+| 1518B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-ip6base-ndrpdr
+| 1518B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-ip6base-ndrpdr
+| 1518B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-ip6base-ndrpdr
+| 9000B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-ip6base-ndrpdr
+| 9000B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-ip6base-ndrpdr
+| 9000B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-ip6base-ndrpdr
+| IMIX-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-ip6base-ndrpdr
+| IMIX-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-ip6base-ndrpdr
+| IMIX-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
index 60a83c74da..d6c1e99fee 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
index 5bd3f5e61f..ce6952badc 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index 64c6daf5e0..6b2ecd06e0 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -87,50 +87,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-ndrpdr
+| 78B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-ndrpdr
+| 78B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-ndrpdr
+| 78B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-ndrpdr
+| 1518B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-ndrpdr
+| 1518B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-ndrpdr
+| 1518B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-ndrpdr
+| 9000B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-ndrpdr
+| 9000B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-ndrpdr
+| 9000B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-ndrpdr
+| IMIX-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-ndrpdr
+| IMIX-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-ndrpdr
+| IMIX-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index 99d404503a..c0a7b13c78 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale200k-ndrpdr
+| 78B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale200k-ndrpdr
+| 78B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale200k-ndrpdr
+| 78B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale200k-ndrpdr
+| 1518B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale200k-ndrpdr
+| 1518B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale200k-ndrpdr
+| 1518B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale200k-ndrpdr
+| 9000B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale200k-ndrpdr
+| 9000B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale200k-ndrpdr
+| 9000B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale200k-ndrpdr
+| IMIX-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale200k-ndrpdr
+| IMIX-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale200k-ndrpdr
+| IMIX-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 10cd19b8e2..b22e623ec1 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale20k-ndrpdr
+| 78B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale20k-ndrpdr
+| 78B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale20k-ndrpdr
+| 78B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale20k-ndrpdr
+| 1518B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale20k-ndrpdr
+| 1518B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale20k-ndrpdr
+| 1518B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale20k-ndrpdr
+| 9000B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale20k-ndrpdr
+| 9000B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale20k-ndrpdr
+| 9000B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale20k-ndrpdr
+| IMIX-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale20k-ndrpdr
+| IMIX-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale20k-ndrpdr
+| IMIX-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index 099d899ede..f5863140c1 100644
--- a/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale2m-ndrpdr
+| 78B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale2m-ndrpdr
+| 78B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale2m-ndrpdr
+| 78B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale2m-ndrpdr
+| 1518B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale2m-ndrpdr
+| 1518B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale2m-ndrpdr
+| 1518B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale2m-ndrpdr
+| 9000B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale2m-ndrpdr
+| 9000B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale2m-ndrpdr
+| 9000B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale2m-ndrpdr
+| IMIX-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale2m-ndrpdr
+| IMIX-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale2m-ndrpdr
+| IMIX-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
index ace094fd92..28e692cde7 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-dot1q-ip6base-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-dot1q-ip6base-ndrpdr
+| 78B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-dot1q-ip6base-ndrpdr
+| 78B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-dot1q-ip6base-ndrpdr
+| 78B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-ip6base-ndrpdr
+| 1518B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-ip6base-ndrpdr
+| 1518B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-ip6base-ndrpdr
+| 1518B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-ip6base-ndrpdr
+| 9000B-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-ip6base-ndrpdr
+| 9000B-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-ip6base-ndrpdr
+| 9000B-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-ip6base-ndrpdr
+| IMIX-1c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-ip6base-ndrpdr
+| IMIX-2c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-ip6base-ndrpdr
+| IMIX-4c-dot1q-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
index 7f4afcd17c..0917bf770c 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-copwhtlistbase-ndrpdr.robot
@@ -94,50 +94,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 78B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 1518B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| 9000B-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-1c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-2c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
+| IMIX-4c-ethip6-ip6base-copwhtlistbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
index 38d6a02567..e0b3042d49 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-iacldstbase-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 78B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 1518B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| 9000B-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-1c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-2c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-iacldstbase-ndrpdr
+| IMIX-4c-ethip6-ip6base-iacldstbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
index c3ca6074e0..c3e5ae46fc 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6base-ndrpdr
+| 78B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6base-ndrpdr
+| 78B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6base-ndrpdr
+| 78B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6base-ndrpdr
+| 1518B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6base-ndrpdr
+| 1518B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6base-ndrpdr
+| 1518B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6base-ndrpdr
+| 9000B-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6base-ndrpdr
+| 9000B-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6base-ndrpdr
+| 9000B-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6base-ndrpdr
+| IMIX-1c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6base-ndrpdr
+| IMIX-2c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6base-ndrpdr
+| IMIX-4c-ethip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
index d918bc4a84..458e4551ef 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale200k-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale200k-ndrpdr
+| 78B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale200k-ndrpdr
+| 78B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale200k-ndrpdr
+| 78B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale200k-ndrpdr
+| 1518B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale200k-ndrpdr
+| 1518B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale200k-ndrpdr
+| 1518B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale200k-ndrpdr
+| 9000B-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale200k-ndrpdr
+| 9000B-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale200k-ndrpdr
+| 9000B-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale200k-ndrpdr
+| IMIX-1c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale200k-ndrpdr
+| IMIX-2c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale200k-ndrpdr
+| IMIX-4c-ethip6-ip6scale200k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
index 46b4d128b9..63aabc49b0 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale20k-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale20k-ndrpdr
+| 78B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale20k-ndrpdr
+| 78B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale20k-ndrpdr
+| 78B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale20k-ndrpdr
+| 1518B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale20k-ndrpdr
+| 1518B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale20k-ndrpdr
+| 1518B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale20k-ndrpdr
+| 9000B-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale20k-ndrpdr
+| 9000B-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale20k-ndrpdr
+| 9000B-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale20k-ndrpdr
+| IMIX-1c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale20k-ndrpdr
+| IMIX-2c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale20k-ndrpdr
+| IMIX-4c-ethip6-ip6scale20k-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
index 9df8d9b6e1..a4d7e73efb 100644
--- a/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
+++ b/tests/vpp/perf/ip6/2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr.robot
@@ -89,50 +89,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6-ip6scale2m-ndrpdr
+| 78B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6-ip6scale2m-ndrpdr
+| 78B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6-ip6scale2m-ndrpdr
+| 78B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6-ip6scale2m-ndrpdr
+| 1518B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6-ip6scale2m-ndrpdr
+| 1518B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6-ip6scale2m-ndrpdr
+| 1518B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6-ip6scale2m-ndrpdr
+| 9000B-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6-ip6scale2m-ndrpdr
+| 9000B-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6-ip6scale2m-ndrpdr
+| 9000B-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6-ip6scale2m-ndrpdr
+| IMIX-1c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6-ip6scale2m-ndrpdr
+| IMIX-2c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6-ip6scale2m-ndrpdr
+| IMIX-4c-ethip6-ip6scale2m-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
index 2007c6ba19..79942e6ef7 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip4-ip6base-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6lispip4-ip6base-ndrpdr
+| 78B-1c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6lispip4-ip6base-ndrpdr
+| 78B-2c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6lispip4-ip6base-ndrpdr
+| 78B-4c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6lispip4-ip6base-ndrpdr
+| 1518B-1c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6lispip4-ip6base-ndrpdr
+| 1518B-2c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6lispip4-ip6base-ndrpdr
+| 1518B-4c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6lispip4-ip6base-ndrpdr
+| 9000B-1c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6lispip4-ip6base-ndrpdr
+| 9000B-2c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6lispip4-ip6base-ndrpdr
+| 9000B-4c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6lispip4-ip6base-ndrpdr
+| IMIX-1c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6lispip4-ip6base-ndrpdr
+| IMIX-2c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6lispip4-ip6base-ndrpdr
+| IMIX-4c-ethip6lispip4-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
index cd9fe8353b..cff2a72097 100644
--- a/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
+++ b/tests/vpp/perf/ip6_tunnels/10ge2p1x710-ethip6lispip6-ip6base-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6lispip6-ip6base-ndrpdr
+| 78B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6lispip6-ip6base-ndrpdr
+| 78B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6lispip6-ip6base-ndrpdr
+| 78B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6lispip6-ip6base-ndrpdr
+| 1518B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6lispip6-ip6base-ndrpdr
+| 9000B-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-1c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-2c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6lispip6-ip6base-ndrpdr
+| IMIX-4c-ethip6lispip6-ip6base-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
index 960dfe129c..7200305d5d 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1ad-l2xcbase-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1ad-l2xcbase-ndrpdr
+| 64B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1ad-l2xcbase-ndrpdr
+| 64B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1ad-l2xcbase-ndrpdr
+| 64B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1ad-l2xcbase-ndrpdr
+| 1518B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1ad-l2xcbase-ndrpdr
+| 1518B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1ad-l2xcbase-ndrpdr
+| 1518B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1ad-l2xcbase-ndrpdr
+| 9000B-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1ad-l2xcbase-ndrpdr
+| 9000B-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1ad-l2xcbase-ndrpdr
+| 9000B-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1ad-l2xcbase-ndrpdr
+| IMIX-1c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1ad-l2xcbase-ndrpdr
+| IMIX-2c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1ad-l2xcbase-ndrpdr
+| IMIX-4c-dot1ad-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 753d7e9f34..057be64b7c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -95,50 +95,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 16ebb87341..811d654106 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -99,50 +99,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-ndrpdr
+| 64B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-ndrpdr
+| 64B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-ndrpdr
+| 64B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
index 33c45320de..577fb89bf6 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
index 62aa381dd5..d710ee3d70 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
index e488b7d514..ef27fbcd9f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
index b952a19149..1036997ce9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
index 6ec02a4aff..f5a867e0f9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
index 08d515c725..bf24641933 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
index 92ca2a1a95..bdf06621b6 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
index 5083c68e8b..6fe134e92f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
index 8772ac537e..487fb31b30 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
index b5a48354ac..97acad3212 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
index 318e584a71..440274ffd0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
index 53e5b96e65..20130c62e9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
index b51807de55..46f11294c5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
index 298714c126..d6fe9a8f00 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
index fc828e9bd5..8bdc7f5874 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
index 9a6828ae1a..5d57e29fa9 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
index 5d502b86b9..2894d37341 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
index 636997b807..aceeffea69 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
index b71f3eb227..e19ba3fffe 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
index c026d79742..9e237107fb 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
index d72a4e410f..fed44e8f1e 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
index 97c0d724f8..11dc34aac3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
index 0e1b1616a8..3313d24a09 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
index 822420b6b0..d0690bc702 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
index 3e65aadfb0..daaeff11dd 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
index a4a46b1d34..f9f49fc203 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
index 7c8dc8cf78..f92774f71a 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-macip-iacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index 39a5cfd41e..1bc9feaa04 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
index 25416a0d8c..e8e736e327 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
index 556c1f46e4..00e94ea883 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
index 51e09567cb..3761a7f8cf 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
index 248dce0c10..1e5b504633 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
index ef16a2006b..cdadd951b0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
index 386f2ca05e..4d20c2a195 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl10sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
index 21c0585338..b4cf6b36fa 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
index 895891a939..9d64a13296 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
index ad22c93141..66758f61a2 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
index 2ae8eb4f34..7db0ce8c2c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
index 9f8c8afb06..db55802ad0 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
index 9adb7d4ca3..8f83dbd2db 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl1sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
index 3c64be014d..e308392dc3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
index 473cb41640..e7d129ef6b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
index 5e0f9ebcc8..61cbb84002 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sf-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
index d0c9b7fb79..3b38c86d6c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100flows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
index 7b7c535a2e..4d953e733b 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-100kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
index 5649b1d990..5cecd2b33f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-oacl50sl-10kflows-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index e29863e242..b09fd51f3f 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index b98d943e23..7cc8ac7352 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 83b79deded..8eadec4df5 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
index 4f80b2e1da..5a8697f17c 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2patch-ndrpdr
+| 64B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2patch-ndrpdr
+| 64B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2patch-ndrpdr
+| 64B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2patch-ndrpdr
+| 1518B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2patch-ndrpdr
+| 1518B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2patch-ndrpdr
+| 1518B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2patch-ndrpdr
+| 9000B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2patch-ndrpdr
+| 9000B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2patch-ndrpdr
+| 9000B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2patch-ndrpdr
+| IMIX-1c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2patch-ndrpdr
+| IMIX-2c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2patch-ndrpdr
+| IMIX-4c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index 11739bb2d3..5ad4572bc3 100644
--- a/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-ndrpdr
+| 64B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-ndrpdr
+| 64B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-ndrpdr
+| 64B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-ndrpdr
+| 1518B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-ndrpdr
+| 1518B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-ndrpdr
+| 1518B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-ndrpdr
+| 9000B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-ndrpdr
+| 9000B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-ndrpdr
+| 9000B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-ndrpdr
+| IMIX-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-ndrpdr
+| IMIX-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-ndrpdr
+| IMIX-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
index 46b9996fff..7588d89237 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-gbp-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
index 45daea4975..ef22a69f4c 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
index 3148be3ca7..052ebc2d9e 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-dot1q-l2xcbase-ndrpdr.robot
@@ -90,50 +90,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-ndrpdr
+| 64B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-ndrpdr
+| 64B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-ndrpdr
+| 64B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
index fd431995e5..25c4aded99 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
index afbbc74e97..7be4e84d70 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale100kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale100kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
index 21f4ec0202..8f61a5cb29 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale10kmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale10kmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
index 52088d5dd4..d9e89b6fd0 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2bdscale1mmaclrn-ndrpdr.robot
@@ -91,50 +91,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 64B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 1518B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| 9000B-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-1c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-2c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
+| IMIX-4c-eth-l2bdscale1mmaclrn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
index 54632c14db..81b7817a0f 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2patch-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2patch-ndrpdr
+| 64B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2patch-ndrpdr
+| 64B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2patch-ndrpdr
+| 64B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2patch-ndrpdr
+| 1518B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2patch-ndrpdr
+| 1518B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2patch-ndrpdr
+| 1518B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2patch-ndrpdr
+| 9000B-1c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2patch-ndrpdr
+| 9000B-2c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2patch-ndrpdr
+| 9000B-4c-eth-l2patch-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2patch-ndrpdr
+| IMIX-1c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2patch-ndrpdr
+| IMIX-2c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2patch-ndrpdr
+| IMIX-4c-eth-l2patch-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
index 2e905e0776..f2f41dda40 100644
--- a/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
+++ b/tests/vpp/perf/l2/2n1l-10ge2p1x710-eth-l2xcbase-ndrpdr.robot
@@ -86,50 +86,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-ndrpdr
+| 64B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-ndrpdr
+| 64B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-ndrpdr
+| 64B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-ndrpdr
+| 1518B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-ndrpdr
+| 1518B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-ndrpdr
+| 1518B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-ndrpdr
+| 9000B-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-ndrpdr
+| 9000B-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-ndrpdr
+| 9000B-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-ndrpdr
+| IMIX-1c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-ndrpdr
+| IMIX-2c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-ndrpdr
+| IMIX-4c-eth-l2xcbase-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-l3dsr-ndrpdr.robot b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-l3dsr-ndrpdr.robot
index 4cea586dc0..619db6c615 100644
--- a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-l3dsr-ndrpdr.robot
+++ b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-l3dsr-ndrpdr.robot
@@ -88,50 +88,50 @@
 | | ... | traffic_directions=${1}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 64B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 64B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 64B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 1518B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 1518B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 1518B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 9000B-1c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 9000B-2c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
+| 9000B-4c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-loadbalancer-l3dsr-ndrpdr
+| IMIX-1c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-loadbalancer-l3dsr-ndrpdr
+| IMIX-2c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-loadbalancer-l3dsr-ndrpdr
+| IMIX-4c-ethip4-loadbalancer-l3dsr-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
index 7d5b0355a0..d96c3f6d9f 100644
--- a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
+++ b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-maglev-ndrpdr.robot
@@ -88,50 +88,50 @@
 | | ... | traffic_directions=${1}
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-loadbalancer-maglev-ndrpdr
+| 64B-1c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-loadbalancer-maglev-ndrpdr
+| 64B-2c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-loadbalancer-maglev-ndrpdr
+| 64B-4c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-loadbalancer-maglev-ndrpdr
+| 1518B-1c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-loadbalancer-maglev-ndrpdr
+| 1518B-2c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-loadbalancer-maglev-ndrpdr
+| 1518B-4c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-loadbalancer-maglev-ndrpdr
+| 9000B-1c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-loadbalancer-maglev-ndrpdr
+| 9000B-2c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-loadbalancer-maglev-ndrpdr
+| 9000B-4c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-loadbalancer-maglev-ndrpdr
+| IMIX-1c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-loadbalancer-maglev-ndrpdr
+| IMIX-2c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-loadbalancer-maglev-ndrpdr
+| IMIX-4c-ethip4-loadbalancer-maglev-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-nat4-ndrpdr.robot b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-nat4-ndrpdr.robot
index cfe1d5cff5..7c1d9cdba4 100644
--- a/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-nat4-ndrpdr.robot
+++ b/tests/vpp/perf/lb/2n1l-10ge2p1x710-ethip4-loadbalancer-nat4-ndrpdr.robot
@@ -87,50 +87,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-loadbalancer-nat4-ndrpdr
+| 64B-1c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-loadbalancer-nat4-ndrpdr
+| 64B-2c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-loadbalancer-nat4-ndrpdr
+| 64B-4c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-loadbalancer-nat4-ndrpdr
+| 1518B-1c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-loadbalancer-nat4-ndrpdr
+| 1518B-2c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-loadbalancer-nat4-ndrpdr
+| 1518B-4c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-loadbalancer-nat4-ndrpdr
+| 9000B-1c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-loadbalancer-nat4-ndrpdr
+| 9000B-2c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-loadbalancer-nat4-ndrpdr
+| 9000B-4c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-loadbalancer-nat4-ndrpdr
+| IMIX-1c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-loadbalancer-nat4-ndrpdr
+| IMIX-2c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-loadbalancer-nat4-ndrpdr
+| IMIX-4c-ethip4-loadbalancer-nat4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index 2967e6799b..23aabe38e8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index dbe796bef8..dbcb4e1eb4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index 4660692ff0..a7fc570a11 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index e59465e869..8271c2f65f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index f14e30fd67..19b6570c0c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 1d37b1a31d..b7c0b03e78 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 8cb7269773..77b821507f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
index d0dd8054d5..60bd2b5b89 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
index 8faf73e300..7ce11104bb 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
index 80ab0c2287..5811790443 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
index a8854a65d3..ff69d9aee2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index 6936213c17..60ea381ac8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index 977a83c91b..9d488cdd1a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 0b8f72adb3..b7b6af2b12 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index d6ecd7eace..92667973b8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 2b7558f575..05badd6ffe 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index c21189eeea..260f1052a1 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index a37bb766c1..f6d0af643a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index 555251398e..a0301c2f46 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index d377efbfbe..2c55a2f6b2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 98ee959d05..ffa0ab96ef 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -103,34 +103,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
index 15d10a6bcb..503d7c13d6 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-40mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
index db78d67611..61eacd5d89 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
index 92ae5954b1..f54a041960 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index 7f04fc4a2b..08f25005ae 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index 13c45ec05e..695c42e05b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index 246200b9b7..77fe9c8536 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 007b6d87b0..05a91eb8bc 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 75f66357e8..9585c89507 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 76d19babf1..7ad94622c0 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index bcbb525d8f..fa935adb35 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
index c39be48629..496d4fadf7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
index 30225ca9d7..6c9f8c5216 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
index 79c0d15afa..fb303253bf 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
index 1812632747..ad48a1f96f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
index 950e384de8..e2fe413869 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-24mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
index 60012e4ec3..3b79e5d1b4 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-24mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
index 2162b85d48..7f49db5edf 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-48mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
index f3e99cee13..6eca528815 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
index 1e4f6f0872..f010070b80 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
index 1505c33f45..5c5100cc68 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-32mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
index 11b4f236bb..57afa6676e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain/2n-10ge2p1x710-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-32mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index a8533669ba..4d9977034a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index e5f43d3d74..c1f98fb4fc 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 27127b6fe8..79d88e19af 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 29ac5ad9d2..f59eed1a73 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec10000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 5e399f13c7..86c5c5dab3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 47e0e2170d..86e784d347 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index e625e3084f..103c3b1d36 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 24fe385d8b..d7a5530d67 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec1000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 74734dea38..052a5f4674 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 620c0cfdda..a4d7f45142 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 3973f2c22a..aea0bb79c7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 7504a54b84..70dd7f4a3f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec20000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index fdde4473da..14e02b8314 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 3a092d66b8..ea035d8f3b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 48d8d51a4d..a96467f92b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 9a9ee2e7e6..84ac8612f3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 992447b1f9..f86abbf145 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -118,38 +118,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index feeacbe2ff..2146e17b33 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 02b427fe71..cbe6799242 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index a090cc8a11..e25daca996 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec400tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 971442271d..9744bd96ca 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index ade3914e74..7b8dedbf5f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 2e912b184a..ecf096c890 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 741f50b344..c2684a265d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec40tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 94c97f9f83..0b580b7fc9 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 499cdaa985..798bbabc6a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 281ae7c18c..94d1eee7b7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec4tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 448aeff522..df5afdce53 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 11a536cf99..24e864f648 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index e09b9ced1c..fb722f01fe 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 7c2bebdd23..b1a252e968 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec5000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 3b160e3c96..b97a6876ca 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-16mif-8dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
index e7097f0ebd..258011ce1c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-2mif-1dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
index b5767b8760..a2e4202cb3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-4mif-2dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
index 9c4b25b113..4053a633b8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/chain_ipsec/10ge2p1x710-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr.robot
@@ -119,38 +119,38 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 64B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| 1518B-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-1c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-2c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
+| IMIX-4c-ethip4ipsec60000tnlsw-l2bd-1ch-8mif-4dcr1c-vppip4-aes256gcm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
index e933cf9ccc..cd4399bc54 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10pl-20mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
index 005599dcbc..53fdcc59f3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10pl-20mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
index 47b18637f8..96ea06e124 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10pl-20mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
index 12c09ae374..d2b3afa93f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-10dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
index c3e4fb00dc..d6de005502 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-10dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
index 9ee62c7df5..fea9bc1992 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-1dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
index 8a8861fce7..aaa2bc9f93 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-1dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
index 520f551ff2..720f2c340c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
index 6a9d7fe679..090486d534 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
index 86e14d155b..983dadc0a7 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
index d86bdfaabb..d17da8ee2d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
index c7742e93a9..5363a9d59f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
index 49e8568785..1f864ad94a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
index 56da89f2a9..0e6c83347b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
index 25b4bdeac7..15c9320a8e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1pl-2mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
index 22c8ca71ed..1582fa871a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
index f4cf03a08e..5508a24048 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
index d624d795bd..6e1852b67d 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
index c991cfc16c..0b7afd238f 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
index 2b1e26e968..7c6151af9b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-20dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
index e13b7ac15c..14ebcd529a 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-2dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
index a1f6e2f86b..2417d4df37 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-2dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
index 507d97041f..e594ccc112 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
index 578ad8e267..079e2450c3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
index 641227350b..ea4f115e2c 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
index fa77322706..724986c036 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-4mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
index 1aa1c16c36..17d865509e 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-8mif-4dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
index bab7cce948..d5a9e82b58 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2pl-8mif-4dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
index f8cb9949c9..a0a6f70950 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4pl-8mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
index c156f3cc99..14497cd045 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4pl-8mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
index 47b12581c4..c6bca87bb9 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4pl-8mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
index 98e6289ed3..f9637da8d2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4pl-8mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
index fe3426adda..4faf2dd380 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4pl-8mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
index 2dfa62e330..c3be0ea6d3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6pl-12mif-12dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
index 9d447d3393..c1619a8de3 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6pl-12mif-12dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
index a6339807db..bbacb6e241 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6pl-12mif-24dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
index 830a5c1af2..ac1a947428 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6pl-12mif-6dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
index 1e7a42040f..a79f087041 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6pl-12mif-6dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
index 561a4f8b78..f93db7c1d8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8pl-16mif-16dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
index 76d228623f..9cbd16da5b 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr.robot
@@ -102,34 +102,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8pl-16mif-16dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
index 9fb5118668..aab45e1ea2 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8pl-16mif-8dcr1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
index 3f7330f77e..0d1d00c0d8 100644
--- a/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/dcr_memif/pipeline/2n-10ge2p1x710-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8pl-16mif-8dcr2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
index 5ef44bb800..6f2c62c5c6 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
index 5500e91345..f37b8b5ee5 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
index f091eeea2a..2f6154c502 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-10ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 6c09fd7911..b403c62536 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
index 434eec36ac..8a5118c5c9 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 282f70bad8..6e371168e2 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
index f8adab7cef..589c0c7eb9 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
index b49c2004cc..160a293062 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-20vh-10vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
index a598e5a2bb..73637917cf 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-20vh-10vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
index bcae9a8fe4..033e95c048 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-2vh-1vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
index 63f5e14a29..85902d7722 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-2vh-1vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
index 870ab25955..74555e2e95 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 284907ba30..f131d1afdf 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 956ac8892f..9b63250005 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 9477d53bf6..8dabcdfb95 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-1ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
index cfd036f573..c3712c5f61 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
index 303be74ffd..b4418dd419 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
index 1dd445aab1..e63a7fd418 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 52bf949cad..d03915e535 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 8472f77a41..21d12d91af 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
index 8ff5bb6787..73c2f3e059 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -100,34 +100,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
index 788ca92474..c1e467cc67 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-40vh-20vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
index cdb79cef70..dfe83349f3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-4vh-2vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
index 82aba728ba..3ab9b15ba7 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-4vh-2vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 8f09e7928e..12f7ddc6a0 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 094898d63d..6ddc72d41d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-2ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 1c62654b94..5a2012b3ba 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
index c624200fbb..df4d0e6e1d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 9b8f95a05f..27a96b2bec 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
index ec6f1521d4..7035e6095d 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -100,34 +100,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
index 89b4642834..65e03a76d3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -100,34 +100,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
index 7a7e873b0a..19f568f70c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-8vh-4vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
index 65a757b47c..4ae756565c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-4ch-8vh-4vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
index 21b8a50acd..ba9b49770b 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-12vh-6vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
index 009ffe1186..b906465046 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-12vh-6vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
index c35ecd3828..b52b142323 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-24vh-12vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
index 6242b7a681..cd13754d86 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-6ch-24vh-12vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
index 71d02b130e..cb4714f9bc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr.robot
@@ -100,34 +100,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-6ch-48vh-24vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
index 7a512a1259..7d787cd688 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-16vh-8vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
index c734e59efd..846a31baeb 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-16vh-8vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
index 0bc7d01681..ede0366992 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 64B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 1518B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| 9000B-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
+| IMIX-4c-eth-l2bd-8ch-32vh-16vm1t-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
index adfe8afef6..1dee327970 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain/2n-10ge2p1x710-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr.robot
@@ -100,34 +100,34 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 64B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc04-1518B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 1518B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc07-9000B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| 9000B-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc10-IMIX-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-1c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
+| IMIX-2c-eth-l2bd-8ch-32vh-16vm2t-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
index 69076addbd..8e946b3deb 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
index 281a4112da..10ed085662 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
index a086bfebcd..94cd09a5e2 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
index 1c3ba27193..4cff4f0ed2 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-10ch-20vh-10vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
index 030e1006c3..2357ec5af4 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
index f66ac26e84..fe52365fcc 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
index 69704462e7..7f3948ef8e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
index afc664ddde..3f793cecd8 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-1ch-2vh-1vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
index deff546b64..3f3ade2b78 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
index c4da4c0310..28ebcdf961 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
index 49fb60062e..5af18c0420 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
index 90487bb209..e30cba948e 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-2ch-4vh-2vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
index 5018bc38ac..068a7bb3b1 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
index 1f2d320c0b..a152fb9172 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
index a6c17bec08..f6eecd4ad3 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
index e747d8f632..f357372374 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-4ch-8vh-4vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
index af0b563b74..aed688e305 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
index 24b41265dc..e43397b462 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-6ch-12vh-6vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
index 8d6cb573da..efc7a3fd34 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
index d09aa278a0..d61e8fec6c 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
index 663dc80983..f936822554 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm1t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
index dc6850cd75..7af05ce515 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 118B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 118B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 118B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 1518B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 1518B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 1518B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 9000B-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 9000B-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| 9000B-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| IMIX-1c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| IMIX-2c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
+| IMIX-4c-dot1qip4vxlan-l2bd-8ch-16vh-8vm2t-testpmd-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
index 1af05a84f4..b0685cfcad 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
index 84cefcadc2..869adf8d22 100644
--- a/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
+++ b/tests/vpp/perf/nfv_density/vm_vhost/chain_dot1qip4vxlan/2n-10ge2p1x710-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf.robot
@@ -120,50 +120,50 @@
 | | Display Reconfig Test Message | ${result}
 
 *** Test Cases ***
-| tc01-118B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 118B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 118B | 1C
 | | frame_size=${118} | phy_cores=${1}
 
-| tc02-118B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 118B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 118B | 2C
 | | frame_size=${118} | phy_cores=${2}
 
-| tc03-118B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 118B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 118B | 4C
 | | frame_size=${118} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 1518B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 1518B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 1518B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 9000B-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 9000B-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| 9000B-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| IMIX-1c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| IMIX-2c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
+| IMIX-4c-dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm2t-testpmd-reconf
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
index 20316a75fe..4a5dc7dcd0 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr.robot
@@ -111,50 +111,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 78B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 78B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 78B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 1518B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 1518B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 1518B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 9000B-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 9000B-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| 9000B-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| IMIX-1c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| IMIX-2c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
+| IMIX-4c-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
index 184a3c9e7b..bd1cff7c9b 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr.robot
@@ -115,50 +115,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 78B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 78B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 78B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| 9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
+| IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
index 6b8cfcc0d6..c415168141 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr.robot
@@ -114,50 +114,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 78B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 78B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 78B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 1518B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 1518B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 1518B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 9000B-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 9000B-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| 9000B-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| IMIX-1c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| IMIX-2c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
+| IMIX-4c-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
index b17bb6b8b5..98bad15d3a 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr.robot
@@ -126,50 +126,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 78B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 78B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 78B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 1518B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 1518B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 1518B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 9000B-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 9000B-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| 9000B-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| IMIX-1c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| IMIX-2c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
+| IMIX-4c-ethip6srhip6-ip6base-srv6proxy-dyn-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
index 6d0f6693f0..105987b178 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr.robot
@@ -126,50 +126,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 78B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 78B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 78B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 1518B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 1518B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 1518B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 9000B-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 9000B-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| 9000B-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| IMIX-1c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| IMIX-2c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
+| IMIX-4c-ethip6srhip6-ip6base-srv6proxy-masq-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
index e820365995..806f0b2eff 100644
--- a/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
+++ b/tests/vpp/perf/srv6/10ge2p1x710-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr.robot
@@ -126,50 +126,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 78B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 1C
 | | frame_size=${78} | phy_cores=${1}
 
-| tc02-78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 78B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 2C
 | | frame_size=${78} | phy_cores=${2}
 
-| tc03-78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 78B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 78B | 4C
 | | frame_size=${78} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 1518B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 1518B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 1518B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 9000B-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 9000B-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| 9000B-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| IMIX-1c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| IMIX-2c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
+| IMIX-4c-ethip6srhip6-ip6base-srv6proxy-stat-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index b15d741689..0974ba9b2c 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -111,50 +111,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index b7ce283418..0909b2e6d4 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -112,50 +112,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-1lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 8887c9c0eb..0de8bf6aa2 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 54e8d75c01..72bb5772e5 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -109,50 +109,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6bbf281950..9d21133762 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -111,50 +111,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index e744a05d0c..1e515c5da0 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -112,50 +112,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-2lbvpplacp-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index eb3ae4532d..a32e9147ba 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -108,50 +108,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index da6cb8bbbd..0cfe2a9f7d 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -109,50 +109,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index c54070bd0f..26bde654ce 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 4fe2cb684b..acc1917da2 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -106,50 +106,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index 6792fce0e0..6cff0982d7 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -101,50 +101,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 01a4ffb6dc..a42725d115 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 38e91669b7..0aff26c44d 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index efdf568b3e..b1717de385 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -101,50 +101,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index b2775b7033..adcd09a72f 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -97,50 +97,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 3663a43038..c48380bb75 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index 05dfca848d..cfcbc63155 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
index 925329848e..583372aa50 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
@@ -99,50 +99,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 1e20251e9e..dfa41ee98a 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index ad4c70a749..be4156133b 100644
--- a/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -103,50 +103,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 079fc71eb3..17774dc63a 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -104,50 +104,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index e84d5fba96..8782456ad7 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
index d7d422a60d..1fa9f98e82 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
@@ -105,50 +105,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index a573dbceae..f6c92a95a3 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -101,50 +101,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 86f5b8850d..2eacce5443 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
index 35963de599..4c7affa2c5 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
@@ -102,50 +102,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-dot1q-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
index 2464c267e2..af592f228c 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -100,50 +100,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 801fe524d6..f96a0a0b53 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -101,50 +101,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
index 423c35ddaf..961427fb19 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
@@ -101,50 +101,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2bdbasemaclrn-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
index c01d5d680e..34fc88f739 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -97,50 +97,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
index 88618cd7ab..17e69a6660 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
index 7b49740664..bac235ba3a 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr.robot
@@ -97,50 +97,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 64B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 1518B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| 9000B-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-1c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-2c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
+| IMIX-4c-eth-l2xcbase-eth-2virtiovr1024-1vm-vppl2xc-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
index e7e141a123..9763fdbe14 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr.robot
@@ -98,50 +98,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
index 3249fa3228..a35fea32c8 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr.robot
@@ -99,50 +99,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr.robot b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr.robot
index 6e179c8bc8..beca9a6209 100644
--- a/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr.robot
+++ b/tests/vpp/perf/vm_vhost/2n1l-10ge2p1x710-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr.robot
@@ -99,50 +99,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-64B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 64B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| tc02-64B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 64B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| tc03-64B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 64B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 1518B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 1518B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 1518B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 9000B-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 9000B-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| 9000B-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| IMIX-1c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| IMIX-2c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
+| IMIX-4c-ethip4-ip4base-eth-2virtiovr1024-1vm-vppip4-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
index e9c66ef806..e345a82a66 100644
--- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr.robot
@@ -110,50 +110,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 1C
 | | frame_size=${114} | phy_cores=${1}
 
-| tc02-114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 2C
 | | frame_size=${114} | phy_cores=${2}
 
-| tc03-114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 4C
 | | frame_size=${114} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
index 8c2e4db8e1..33acb73a84 100644
--- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr.robot
@@ -109,50 +109,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 1C
 | | frame_size=${114} | phy_cores=${1}
 
-| tc02-114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 2C
 | | frame_size=${114} | phy_cores=${2}
 
-| tc03-114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 4C
 | | frame_size=${114} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
index d54116c044..1bed28b65c 100644
--- a/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
+++ b/tests/vpp/perf/vts/2n1l-10ge2p1x710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr.robot
@@ -110,50 +110,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| tc01-114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 114B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 1C
 | | frame_size=${114} | phy_cores=${1}
 
-| tc02-114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 114B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 2C
 | | frame_size=${114} | phy_cores=${2}
 
-| tc03-114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 114B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 114B | 4C
 | | frame_size=${114} | phy_cores=${4}
 
-| tc04-1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 1518B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| tc05-1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 1518B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| tc06-1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 1518B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| tc07-9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 9000B-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| tc08-9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 9000B-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| tc09-9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| 9000B-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| tc10-IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| IMIX-1c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| tc11-IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| IMIX-2c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| tc12-IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
+| IMIX-4c-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
-- 
2.16.6