Report: Fix NAT44

Change-Id: I9c0b8571673a0fc839430a4dce2ef0e8b9b017e2
Signed-off-by: Tibor Frank <tifrank@cisco.com>

3 files changed, 120 insertions, 120 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
index 04c1898683..af002cab49 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/nat44-2n-clx-xxv710.rst
@@ -80,7 +80,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr.html"></iframe>
+    <iframe id="02n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr.html"></iframe>
+    <iframe id="02p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr}
     \end{figure}
 
 ..
@@ -124,7 +124,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
+        <iframe id="03n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -133,8 +133,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr}
         \end{figure}
 
     .. raw:: latex
@@ -144,7 +144,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
+        <iframe id="03p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -153,8 +153,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr}
         \end{figure}
 
     .. raw:: latex
@@ -167,7 +167,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
+        <iframe id="04n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -176,8 +176,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr}
         \end{figure}
 
     .. raw:: latex
@@ -187,7 +187,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
+        <iframe id="04p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -196,8 +196,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr}
         \end{figure}
 
     .. raw:: latex
@@ -210,7 +210,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
+        <iframe id="05n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -219,8 +219,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr}
         \end{figure}
 
     .. raw:: latex
@@ -230,7 +230,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
+        <iframe id="05p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -239,8 +239,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr}
         \end{figure}
 
     .. raw:: latex
@@ -253,7 +253,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
+        <iframe id="06n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -262,8 +262,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr}
         \end{figure}
 
     .. raw:: latex
@@ -273,7 +273,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
+        <iframe id="06p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr.html"></iframe>
         <p><br></p>
         </center>
 
@@ -282,6 +282,6 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr}
-                \label{fig:2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
+                \label{fig:2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr}
         \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
index dbb51be0f0..fe17279d8a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/nat44-2n-clx-xxv710.rst
@@ -80,7 +80,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr-tsa.html"></iframe>
+    <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr-tsa.html"></iframe>
+    <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa}
     \end{figure}
 
 ..
@@ -124,7 +124,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
+        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -133,8 +133,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -144,7 +144,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
+        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -153,8 +153,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -167,7 +167,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
+        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -176,8 +176,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -187,7 +187,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
+        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -196,8 +196,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -210,7 +210,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
+        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -219,8 +219,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -230,7 +230,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
+        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -239,8 +239,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -253,7 +253,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
+        <iframe id="01p" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -262,8 +262,8 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa}
         \end{figure}
 
     .. raw:: latex
@@ -273,7 +273,7 @@
     .. raw:: html
 
         <center>
-        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
+        <iframe id="01n" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa.html"></iframe>
         <p><br></p>
         </center>
 
@@ -282,6 +282,6 @@
         \begin{figure}[H]
             \centering
                 \graphicspath{{../_build/_static/vpp/}}
-                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr-tsa}
-                \label{fig:2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+                \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
+                \label{fig:2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa}
         \end{figure}
diff --git a/resources/tools/presentation/specification.yaml b/resources/tools/presentation/specification.yaml
index 087459fb91..4c08356f9b 100644
--- a/resources/tools/presentation/specification.yaml
+++ b/resources/tools/presentation/specification.yaml
@@ -16811,9 +16811,9 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -16822,13 +16822,13 @@
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-ndr"
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-ndr"
     layout: "plot-throughput"
 
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -16837,13 +16837,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -16852,13 +16852,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -16867,13 +16867,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -16882,7 +16882,7 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
 #    layout: "plot-throughput"
 
 - type: "plot"
@@ -16901,9 +16901,9 @@
     layout: "plot-throughput"
 
 - type: "plot"
-  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr"
+  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
   algorithm: "plot_perf_box_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -16912,13 +16912,13 @@
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-stl-unidir-avf-pdr"
+    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-stl-unidir-avf-pdr"
     layout: "plot-throughput"
 
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -16927,13 +16927,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-cps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -16942,13 +16942,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-cps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -16957,13 +16957,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-udp-stf-pps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
 #    layout: "plot-throughput"
 #
 #- type: "plot"
-#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr"
+#  title: "Throughput: 2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
 #  algorithm: "plot_perf_box_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -16972,7 +16972,7 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-2t1c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-2t1c-nat44det-ip4routing-tcp-stf-pps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-2t1c-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
 #    layout: "plot-throughput"
 
 - type: "plot"
@@ -17943,9 +17943,9 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -17954,13 +17954,13 @@
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-ndr"
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-ndr"
     layout: "plot-throughput-speedup-analysis"
 
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -17969,13 +17969,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -17984,13 +17984,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -17999,13 +17999,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-ndr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -18014,7 +18014,7 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "22n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-ndr"
+#    title: "22n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-ndr"
 #    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
@@ -18033,9 +18033,9 @@
     layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"
-  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr-tsa"
+  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
   algorithm: "plot_tsa_name"
-  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr-tsa"
+  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr-tsa"
   data: "plot-vpp-throughput-lat-tsa-2n-clx"
   include:
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-udir-ndrpdr"
@@ -18044,13 +18044,13 @@
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-udir-ndrpdr"
     - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-udir-ndrpdr"
   layout:
-    title: "2n-clx-xxv710-64b-nat44det-ip4routing-stl-unidir-avf-pdr"
+    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-stl-unidir-avf-pdr"
     layout: "plot-throughput-speedup-analysis"
 
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -18059,13 +18059,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-cps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-cps-avf-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-cps-ndrpdr"
@@ -18074,13 +18074,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-cps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-cps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-cps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-cps-avf-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -18089,13 +18089,13 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4udp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "2n-clx-xxv710-64b-nat44det-ip4routing-udp-stf-pps-avf-pdr"
+#    title: "2n-clx-xxv710-64b-nat44ed-ip4routing-udp-stf-pps-avf-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 #
 #- type: "plot"
-#  title: "Speedup: 2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  title: "Speedup: 2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
 #  algorithm: "plot_tsa_name"
-#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr-tsa"
+#  output-file: "{DIR[STATIC,VPP]}/2n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr-tsa"
 #  data: "plot-vpp-throughput-lat-tsa-2n-clx"
 #  include:
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h1024-p63-s64512-pps-ndrpdr"
@@ -18104,7 +18104,7 @@
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h65536-p63-s4128768-pps-ndrpdr"
 #    - "tests.vpp.perf.ip4.2n1l-25ge2p1xxv710-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr.64b-.t.c-avf-ethip4tcp-nat44ed-h262144-p63-s16515072-pps-ndrpdr"
 #  layout:
-#    title: "22n-clx-xxv710-64b-nat44det-ip4routing-tcp-stf-pps-avf-pdr"
+#    title: "22n-clx-xxv710-64b-nat44ed-ip4routing-tcp-stf-pps-avf-pdr"
 #    layout: "plot-throughput-speedup-analysis"
 
 - type: "plot"