21 files changed, 229 insertions, 229 deletions

diff --git a/tests/vpp/device/ip4/eth2p-ethip4tcp-snat44det-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44det-dev.robot
index fdffdd34e5..d564c8c398 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4tcp-snat44det-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44det-dev.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Virtual | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | BASE | TCP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44det-dev
+| ... | ethip4tcp-nat44det-dev
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -106,6 +106,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4tcp-snat44det-dev
+| 64B-ethip4tcp-nat44det-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4tcp-snat44ed-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot
index 5fe36c4341..0a60b3f2e1 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4tcp-snat44ed-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4tcp-nat44ed-dev.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Virtual | ETH | IP4FWD | FEATURE | NAT44 | NAT44_ENDPOINT_DEPENDENT
 | ... | BASE | TCP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-dev
+| ... | ethip4tcp-nat44ed-dev
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -112,6 +112,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4tcp-snat44ed-dev
+| 64B-ethip4tcp-nat44ed-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4udp-snat44det-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44det-dev.robot
index e1f56da292..5803b4e590 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4udp-snat44det-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44det-dev.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Virtual | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | BASE | UDP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-dev
+| ... | ethip4udp-nat44det-dev
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -106,6 +106,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4udp-snat44det-dev
+| 64B-ethip4udp-nat44det-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/device/ip4/eth2p-ethip4udp-snat44ed-dev.robot b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot
index 99cb761578..e4e5241b18 100644
--- a/tests/vpp/device/ip4/eth2p-ethip4udp-snat44ed-dev.robot
+++ b/tests/vpp/device/ip4/eth2p-ethip4udp-nat44ed-dev.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Virtual | ETH | IP4FWD | FEATURE | NAT44 | NAT44_ENDPOINT_DEPENDENT
 | ... | BASE | UDP | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-dev
+| ... | ethip4udp-nat44ed-dev
 |
 | Suite Setup | Setup suite topology interfaces | scapy
 | Test Setup | Setup test
@@ -112,6 +112,6 @@
 | | ... | ${protocol} | ${src_port_in} | ${dst_port}
 
 *** Test Cases ***
-| 64B-ethip4udp-snat44ed-dev
+| 64B-ethip4udp-nat44ed-dev
 | | [Tags] | 64B
 | | frame_size=${64} | phy_cores=${0}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot
index 8e66c3321a..35ffc3ca3e 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | TCP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-h1024-p63-s64512-cps
+| ... | ethip4tcp-nat44ed-h1024-p63-s64512-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-1c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-2c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-4c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-1c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-2c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4tcp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-4c-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
index c3735dd37f..ac9d2de465 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | TCP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-h16384-p63-s1032192-cps
+| ... | ethip4tcp-nat44ed-h16384-p63-s1032192-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-1c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-2c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4tcp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-4c-ethip4tcp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
index 9daf9e8681..2595f2d89b 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | TCP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-h262144-p63-s16515072-cps
+| ... | ethip4tcp-nat44ed-h262144-p63-s16515072-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-1c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-2c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4tcp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-4c-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot
index 79bd166551..fb1c31195c 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | TCP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-h4096-p63-s258048-cps
+| ... | ethip4tcp-nat44ed-h4096-p63-s258048-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-1c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-2c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-4c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-1c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-2c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4tcp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-4c-ethip4tcp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
index 21f9aaf3b7..7f9ac68dbf 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | TCP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4tcp-snat44ed-h65536-p63-s4128768-cps
+| ... | ethip4tcp-nat44ed-h65536-p63-s4128768-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-1c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-2c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4tcp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-4c-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1-p1-s1-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1-p1-s1-ndrpdr.robot
index 19617b0534..052d091c9b 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1-p1-s1-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1-p1-s1-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h1-p1-s1
+| ... | ethip4udp-nat44det-h1-p1-s1
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -110,50 +110,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h1-p1-s1-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h1-p1-s1-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1-p63-s63-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1-p63-s63-ndrpdr.robot
index ae35c7bda6..d6058552fa 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1-p63-s63-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1-p63-s63-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SRC_USER_1 | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h1-p63-s63
+| ... | ethip4udp-nat44det-h1-p63-s63
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h1-p63-s63-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h1-p63-s63-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.robot
index 319d72ced3..96a1d64e49 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SCALE | DRV_VFIO_PCI
 | ... | SRC_USER_1024 | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h1024-p63-s64512
+| ... | ethip4udp-nat44det-h1024-p63-s64512
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h1024-p63-s64512-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h1024-p63-s64512-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.robot
index 7c001eded4..bf75e3b37b 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SRC_USER_16384 | SCALE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h16384-p63-s1032192
+| ... | ethip4udp-nat44det-h16384-p63-s1032192
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h16384-p63-s1032192-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h16384-p63-s1032192-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot
index 2e4afe0781..8c6661ec66 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SRC_USER_262144 | SCALE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h262144-p63-s16515072
+| ... | ethip4udp-nat44det-h262144-p63-s16515072
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h262144-p63-s16515072-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h262144-p63-s16515072-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.robot
index 8fb828e6ea..ad7c1de539 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SRC_USER_4096 | SCALE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h4096-p63-s258048
+| ... | ethip4udp-nat44det-h4096-p63-s258048
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h4096-p63-s258048-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h4096-p63-s258048-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot
index 9a1b60a135..96b74b20e0 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr.robot
@@ -18,7 +18,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | NAT44_DETERMINISTIC
 | ... | SRC_USER_65536 | SCALE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44det-h65536-p63-s4128758
+| ... | ethip4udp-nat44det-h65536-p63-s4128758
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -107,50 +107,50 @@
 | | Then Find NDR and PDR intervals using optimized search
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 64B-1c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 64B-2c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 64B-4c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 1518B-1c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 1518B-2c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 1518B-4c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 9000B-1c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 9000B-2c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| 9000B-4c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| IMIX-1c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| IMIX-2c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44det-h65536-p63-s4128758-ndrpdr
+| IMIX-4c-ethip4udp-nat44det-h65536-p63-s4128758-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot
index 746e448d95..710e96f555 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | UDP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-h1024-p63-s64512-cps
+| ... | ethip4udp-nat44ed-h1024-p63-s64512-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-1c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-2c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 64B-4c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-1c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-2c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 1518B-4c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-1c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-2c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| 9000B-4c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-1c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-2c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44ed-h1024-p63-s64512-cps-ndrpdr
+| IMIX-4c-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
index 1e5057a255..fa2149304f 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | UDP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-h16384-p63-s1032192-cps
+| ... | ethip4udp-nat44ed-h16384-p63-s1032192-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 64B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 1518B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-1c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-2c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| 9000B-4c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-1c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-2c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44ed-h16384-p63-s1032192-cps-ndrpdr
+| IMIX-4c-ethip4udp-nat44ed-h16384-p63-s1032192-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
index 0121cacabd..87af2992c5 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | UDP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-h262144-p63-s16515072-cps
+| ... | ethip4udp-nat44ed-h262144-p63-s16515072-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 64B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 1518B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-1c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-2c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| 9000B-4c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-1c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-2c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44ed-h262144-p63-s16515072-cps-ndrpdr
+| IMIX-4c-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot
index d9e155a5d9..bccd6a7c43 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | UDP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-h4096-p63-s258048-cps
+| ... | ethip4udp-nat44ed-h4096-p63-s258048-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-1c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-2c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 64B-4c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-1c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-2c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 1518B-4c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-1c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-2c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| 9000B-4c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-1c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-2c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44ed-h4096-p63-s258048-cps-ndrpdr
+| IMIX-4c-ethip4udp-nat44ed-h4096-p63-s258048-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}
diff --git a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr.robot b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
index a2d1c6ee8b..f0017e96f4 100644
--- a/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
+++ b/tests/vpp/perf/ip4/2n1l-10ge2p1x710-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.robot
@@ -20,7 +20,7 @@
 | ... | NIC_Intel-X710 | ETH | IP4FWD | FEATURE | NAT44 | UDP_SYN
 | ... | NAT44_ENDPOINT_DEPENDENT | BASE | DRV_VFIO_PCI
 | ... | RXQ_SIZE_0 | TXQ_SIZE_0
-| ... | ethip4udp-snat44ed-h65536-p63-s4128768-cps
+| ... | ethip4udp-nat44ed-h65536-p63-s4128768-cps
 |
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
@@ -130,50 +130,50 @@
 | | Then Find NDR and PDR intervals using optimized search | latency=${False}
 
 *** Test Cases ***
-| 64B-1c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 1C
 | | frame_size=${64} | phy_cores=${1}
 
-| 64B-2c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 2C
 | | frame_size=${64} | phy_cores=${2}
 
-| 64B-4c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 64B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 64B | 4C
 | | frame_size=${64} | phy_cores=${4}
 
-| 1518B-1c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 1C
 | | frame_size=${1518} | phy_cores=${1}
 
-| 1518B-2c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 2C
 | | frame_size=${1518} | phy_cores=${2}
 
-| 1518B-4c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 1518B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 1518B | 4C
 | | frame_size=${1518} | phy_cores=${4}
 
-| 9000B-1c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-1c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 1C
 | | frame_size=${9000} | phy_cores=${1}
 
-| 9000B-2c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-2c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 2C
 | | frame_size=${9000} | phy_cores=${2}
 
-| 9000B-4c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| 9000B-4c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | 9000B | 4C
 | | frame_size=${9000} | phy_cores=${4}
 
-| IMIX-1c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-1c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 1C
 | | frame_size=IMIX_v4_1 | phy_cores=${1}
 
-| IMIX-2c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-2c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 2C
 | | frame_size=IMIX_v4_1 | phy_cores=${2}
 
-| IMIX-4c-ethip4udp-snat44ed-h65536-p63-s4128768-cps-ndrpdr
+| IMIX-4c-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr
 | | [Tags] | IMIX | 4C
 | | frame_size=IMIX_v4_1 | phy_cores=${4}