FIX: SNAT -> NAT renaming of API

- Based on https://gerrit.fd.io/r/#/c/8146/

Change-Id: I774483c7e2b419a9b9b6be78812ecf53a5c91eab
Signed-off-by: Peter Mikus <pmikus@cisco.com>

7 files changed, 137 insertions, 137 deletions

diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-nat44-ndrpdrdisc.robot
index 89aa2788ef..325b01ff6f 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | BASE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
 | ... | L3 | Intel-X520-DA2
@@ -25,15 +25,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -70,7 +70,7 @@
 | tc01-64B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -86,9 +86,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -96,7 +96,7 @@
 | tc02-64B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -112,9 +112,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -123,7 +123,7 @@
 | tc03-1518B-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -139,9 +139,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -149,7 +149,7 @@
 | tc04-1518B-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -165,9 +165,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -176,7 +176,7 @@
 | tc05-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -192,9 +192,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -202,7 +202,7 @@
 | tc06-IMIX-1t1c-ethip4-ip4base-snat-1u-1p-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 1 port (session) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -218,9 +218,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdrdisc.robot
index 4eb3862e0f..62bea89f49 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4base-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | BASE
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | BASE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
 | ... | L3 | Intel-X520-DA2
@@ -25,15 +25,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -72,7 +72,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -88,9 +88,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -98,7 +98,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -114,9 +114,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -125,7 +125,7 @@
 | tc03-1518B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -141,9 +141,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -151,7 +151,7 @@
 | tc04-1518B-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -167,9 +167,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -178,7 +178,7 @@
 | tc05-IMIX-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -194,9 +194,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -204,7 +204,7 @@
 | tc06-IMIX-1t1c-ethip4udp-ip4base-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1 user and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -220,9 +220,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdrdisc.robot
index 28b44ebfc6..ade9d42eeb 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale10-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_10
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_10
 | ... | SCALE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,15 +26,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -73,7 +73,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -89,9 +89,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -99,7 +99,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -115,9 +115,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -126,7 +126,7 @@
 | tc03-1518B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -142,9 +142,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -152,7 +152,7 @@
 | tc04-1518B-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -168,9 +168,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -179,7 +179,7 @@
 | tc05-IMIX-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -195,9 +195,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -205,7 +205,7 @@
 | tc06-IMIX-1t1c-ethip4udp-ip4scale10-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 10 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -221,9 +221,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdrdisc.robot
index 9f683679e2..57d9bf6543 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale100-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_100
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_100
 | ... | SCALE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,15 +26,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -73,7 +73,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -89,9 +89,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -99,7 +99,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -115,9 +115,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -126,7 +126,7 @@
 | tc03-1518B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -142,9 +142,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -152,7 +152,7 @@
 | tc04-1518B-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -168,9 +168,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -179,7 +179,7 @@
 | tc05-IMIX-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -195,9 +195,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -205,7 +205,7 @@
 | tc06-IMIX-1t1c-ethip4udp-ip4scale100-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 100 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -221,9 +221,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdrdisc.robot
index 73ede552b2..bc0ef7e500 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale1000-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_1000
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_1000
 | ... | SCALE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,15 +26,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -73,7 +73,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -89,9 +89,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -99,7 +99,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -115,9 +115,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -126,7 +126,7 @@
 | tc03-1518B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -142,9 +142,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -152,7 +152,7 @@
 | tc04-1518B-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 1518 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -168,9 +168,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
@@ -179,7 +179,7 @@
 | tc05-IMIX-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -195,9 +195,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -205,7 +205,7 @@
 | tc06-IMIX-1t1c-ethip4udp-ip4scale1000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 1000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for IMIX frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -221,9 +221,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot
index bce900f0ec..056f213805 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale2000-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_2000
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_2000
 | ... | SCALE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,15 +26,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -73,7 +73,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 2000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -89,9 +89,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -99,7 +99,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4scale2000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 2000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -115,9 +115,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}
diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdrdisc.robot
index 2b91618470..cd7bf41732 100644
--- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrpdrdisc.robot
+++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4udp-ip4scale4000-udpsrcscale15-nat44-ndrpdrdisc.robot
@@ -13,11 +13,11 @@
 
 *** Settings ***
 | Resource | resources/libraries/robot/performance/performance_setup.robot
-| Resource | resources/libraries/robot/ip/snat.robot
+| Resource | resources/libraries/robot/ip/nat.robot
 | Resource | resources/libraries/robot/shared/traffic.robot
 | ...
 | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
-| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | SNAT | SRC_USER_4000
+| ... | NIC_Intel-X520-DA2 | ETH | IP4FWD | FEATURE | NAT44 | SRC_USER_4000
 | ... | SCALE
 | ...
 | Suite Setup | Set up 3-node performance topology with DUT's NIC model
@@ -26,15 +26,15 @@
 | ...
 | Test Setup | Set up performance test
 | ...
-| Test Teardown | Tear down performance discovery test with SNAT
+| Test Teardown | Tear down performance discovery test with NAT
 | ... | ${min_rate}pps | ${framesize} | ${traffic_profile}
 | ...
-| Documentation | *SNAT performance test cases*
+| Documentation | *NAT44 performance test cases*
 | ...
 | ... | *High level description*
 | ...
 | ... | - NDR and PDR tests
-| ... | - 3-node topology, TG-DUT1-DUT2-TG, SNAT is enabled between DUTs.
+| ... | - 3-node topology, TG-DUT1-DUT2-TG, NAT44 is enabled between DUTs.
 | ... | - Cores / threads: 1t1c and 2t2c
 | ... | - Framesize: 64B, 1518B, IMIX
 | ... | - Packet: ETH / IP(src, dst) / UDP(src_port, dst_port) / payload
@@ -73,7 +73,7 @@
 | tc01-64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-snat-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 4000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find NDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -89,9 +89,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find NDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold}
@@ -99,7 +99,7 @@
 | tc02-64B-1t1c-ethip4udp-ip4scale4000-udpsrcscale15-snat-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs IPv4 routing config with 1 thread, 1 phy core,\
-| | ... | 1 receive queue per NIC port. SNAT is configured between DUTs -\
+| | ... | 1 receive queue per NIC port. NAT44 is configured between DUTs -\
 | | ... | 4000 users and 15 ports (sessions) per user.
 | | ... | [Ver] Find PDR for 64 Byte frames using binary search start at 10GE\
 | | ... | linerate, step 100kpps.
@@ -115,9 +115,9 @@
 | | Given Add '1' worker threads and '1' rxqueues in 3-node single-link circular topology
 | | And Add PCI devices to DUTs in 3-node single link topology
 | | And Add no multi seg to all DUTs
-| | And Add SNAT to all DUTs
+| | And Add NAT to all DUTs
 | | And Apply startup configuration on all VPP DUTs
-| | When Initialize SNAT in 3-node circular topology
+| | When Initialize NAT44 in 3-node circular topology
 | | Then Find PDR using binary search and pps | ${framesize} | ${binary_min}
 | | ... | ${binary_max} | ${traffic_profile}
 | | ... | ${min_rate} | ${max_rate} | ${threshold} | ${perf_pdr_loss_acceptance}