CSIT-1203: Add parsing of NDRPDR test

Change-Id: I55be02df7f8979ad4c10b79d87f5065452a3e6e6
Signed-off-by: Tibor Frank <tifrank@cisco.com>
(cherry picked from commit eb5271b56cb94711420a1eb7372b0f4d5f275a40)

16 files changed, 512 insertions, 512 deletions

diff --git a/docs/report/dpdk_performance_tests/packet_latency_graphs/ip4.rst b/docs/report/dpdk_performance_tests/packet_latency_graphs/ip4.rst
index 10b418589d..819e4a9ebd 100644
--- a/docs/report/dpdk_performance_tests/packet_latency_graphs/ip4.rst
+++ b/docs/report/dpdk_performance_tests/packet_latency_graphs/ip4.rst
@@ -24,7 +24,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -33,8 +33,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-x520-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -49,7 +49,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -58,8 +58,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-x520-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -77,7 +77,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -86,8 +86,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-x710-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -102,7 +102,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -111,8 +111,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-x710-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -130,7 +130,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -139,8 +139,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -155,7 +155,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -164,8 +164,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \label{fig:l3fwd-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -183,7 +183,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -192,8 +192,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat}
+            \label{fig:l3fwd-3n-skx-x710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -208,7 +208,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -217,8 +217,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat}
+            \label{fig:l3fwd-3n-skx-x710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -236,7 +236,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -245,8 +245,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \label{fig:l3fwd-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -261,7 +261,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -270,8 +270,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50}
-            \label{fig:l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \label{fig:l3fwd-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -289,7 +289,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -298,8 +298,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat50}
-            \label{fig:l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat}
+            \label{fig:l3fwd-2n-skx-x710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -314,7 +314,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -323,8 +323,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat50}
-            \label{fig:l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat}
+            \label{fig:l3fwd-2n-skx-x710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -342,7 +342,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -351,8 +351,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50}
-            \label{fig:l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \label{fig:l3fwd-2n-skx-xxv710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -367,7 +367,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -376,6 +376,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50}
-            \label{fig:l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \label{fig:l3fwd-2n-skx-xxv710-64b-4t2c-base-ndr-lat}
     \end{figure}
diff --git a/docs/report/dpdk_performance_tests/packet_latency_graphs/l2.rst b/docs/report/dpdk_performance_tests/packet_latency_graphs/l2.rst
index 67f8472191..6d7ea30c98 100644
--- a/docs/report/dpdk_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/dpdk_performance_tests/packet_latency_graphs/l2.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-x520-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-x520-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -78,7 +78,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -87,8 +87,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-x710-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -103,7 +103,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -112,8 +112,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-x710-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -131,7 +131,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -140,8 +140,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-xl710-64b-1t1c-base-ndr-lat}
     \end{figure}
 
 64b-2t2c-base
@@ -156,7 +156,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -165,8 +165,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50}
-            \label{fig:testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
+            \label{fig:testpmd-3n-hsw-xl710-64b-2t2c-base-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -184,7 +184,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -193,8 +193,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat50}
-            \label{fig:testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat}
+            \label{fig:testpmd-3n-skx-x710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -209,7 +209,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -218,8 +218,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat50}
-            \label{fig:testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat}
+            \label{fig:testpmd-3n-skx-x710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -237,7 +237,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -246,8 +246,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50}
-            \label{fig:testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \label{fig:testpmd-3n-skx-xxv710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -262,7 +262,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -271,8 +271,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50}
-            \label{fig:testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \label{fig:testpmd-3n-skx-xxv710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -290,7 +290,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -299,8 +299,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat50}
-            \label{fig:testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat}
+            \label{fig:testpmd-2n-skx-x710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -315,7 +315,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -324,8 +324,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat50}
-            \label{fig:testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat}
+            \label{fig:testpmd-2n-skx-x710-64b-4t2c-base-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -343,7 +343,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -352,8 +352,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50}
-            \label{fig:testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat}
+            \label{fig:testpmd-2n-skx-xxv710-64b-2t1c-base-ndr-lat}
     \end{figure}
 
 64b-4t2c-base
@@ -368,7 +368,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/dpdk/testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -377,6 +377,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/dpdk/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50}
-            \label{fig:testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat}
+            \label{fig:testpmd-2n-skx-xxv710-64b-4t2c-base-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/csit_release_notes.rst b/docs/report/vpp_performance_tests/csit_release_notes.rst
index 35ab440c85..1954ad1a49 100644
--- a/docs/report/vpp_performance_tests/csit_release_notes.rst
+++ b/docs/report/vpp_performance_tests/csit_release_notes.rst
@@ -55,10 +55,10 @@ NDR Changes
 NDR small packet throughput changes between releases are available in a
 CSV and pretty ASCII formats:
 
-  - `csv format for 1t1c <../_static/vpp/performance-changes-ndr-1t1c-full.csv>`_,
-  - `csv format for 2t2c <../_static/vpp/performance-changes-ndr-2t2c-full.csv>`_,
-  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-ndr-1t1c-full.txt>`_,
-  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-ndr-2t2c-full.txt>`_.
+  - `csv format for 1t1c <../_static/vpp/performance-changes-1t1c-ndr.csv>`_,
+  - `csv format for 2t2c <../_static/vpp/performance-changes-2t2c-ndr.csv>`_,
+  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-1t1c-ndr.txt>`_,
+  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-2t2c-ndr.txt>`_.
 
 .. note::
 
@@ -72,10 +72,10 @@ PDR Changes
 NDR small packet throughput changes between releases are available in a
 CSV and pretty ASCII formats:
 
-  - `csv format for 1t1c <../_static/vpp/performance-changes-pdr-1t1c-full.csv>`_,
-  - `csv format for 2t2c <../_static/vpp/performance-changes-pdr-2t2c-full.csv>`_,
-  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-pdr-1t1c-full.txt>`_,
-  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-pdr-2t2c-full.txt>`_.
+  - `csv format for 1t1c <../_static/vpp/performance-changes-1t1c-pdr.csv>`_,
+  - `csv format for 2t2c <../_static/vpp/performance-changes-2t2c-pdr.csv>`_,
+  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-1t1c-pdr.txt>`_,
+  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-2t2c-pdr.txt>`_.
 
 .. note::
 
@@ -89,12 +89,12 @@ MRR Changes
 MRR small packet throughput changes between releases are available in a
 CSV and pretty ASCII formats:
 
-  - `csv format for 1t1c <../_static/vpp/performance-changes-mrr-1t1c-full.csv>`_,
-  - `csv format for 2t2c <../_static/vpp/performance-changes-mrr-2t2c-full.csv>`_,
-  - `csv format for 4t4c <../_static/vpp/performance-changes-mrr-4t4c-full.csv>`_,
-  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-mrr-1t1c-full.txt>`_,
-  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-mrr-2t2c-full.txt>`_,
-  - `pretty ASCII format for 4t4c <../_static/vpp/performance-changes-mrr-4t4c-full.txt>`_.
+  - `csv format for 1t1c <../_static/vpp/performance-changes-1t1c-mrr.csv>`_,
+  - `csv format for 2t2c <../_static/vpp/performance-changes-2t2c-mrr.csv>`_,
+  - `csv format for 4t4c <../_static/vpp/performance-changes-4t4c-mrr.csv>`_,
+  - `pretty ASCII format for 1t1c <../_static/vpp/performance-changes-1t1c-mrr.txt>`_,
+  - `pretty ASCII format for 2t2c <../_static/vpp/performance-changes-2t2c-mrr.txt>`_,
+  - `pretty ASCII format for 4t4c <../_static/vpp/performance-changes-4t4c-mrr.txt>`_.
 
 .. note::
 
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
index 12dc3498e6..230b1045b1 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -78,7 +78,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -87,8 +87,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -103,7 +103,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -112,8 +112,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -131,7 +131,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -140,8 +140,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -156,7 +156,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -165,8 +165,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -184,7 +184,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -193,8 +193,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -209,7 +209,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -218,8 +218,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -237,7 +237,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -246,8 +246,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -262,7 +262,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -271,8 +271,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -290,7 +290,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -299,8 +299,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -315,7 +315,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -324,8 +324,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -343,7 +343,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -352,8 +352,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -368,7 +368,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -377,6 +377,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
index ad341bd2c2..222a7d8301 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_orchestrated.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -78,7 +78,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -87,8 +87,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -103,7 +103,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -112,8 +112,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -131,7 +131,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -140,8 +140,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -156,7 +156,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -165,8 +165,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -184,7 +184,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -193,8 +193,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -209,7 +209,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -218,8 +218,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -237,7 +237,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -246,8 +246,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -262,7 +262,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -271,8 +271,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -290,7 +290,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -299,8 +299,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -315,7 +315,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -324,6 +324,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:k8s-memif-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
index 16bbe20072..a7f352498e 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-features
@@ -75,7 +75,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -84,8 +84,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+            \label{fig:ip4-3n-hsw-x520-64b-1t1c-features-ndr-lat}
     \end{figure}
 
 64b-2t2c-features
@@ -100,7 +100,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -109,8 +109,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+            \label{fig:ip4-3n-hsw-x520-64b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -128,7 +128,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -137,8 +137,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -153,7 +153,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -162,8 +162,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-features
@@ -178,7 +178,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -187,8 +187,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat}
+            \label{fig:ip4-3n-hsw-x710-64b-1t1c-features-ndr-lat}
     \end{figure}
 
 64b-2t2c-features
@@ -203,7 +203,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -212,8 +212,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat50}
-            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat}
+            \label{fig:ip4-3n-hsw-x710-64b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -231,7 +231,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -240,8 +240,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -256,7 +256,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -265,8 +265,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -284,7 +284,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -293,8 +293,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -309,7 +309,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -318,8 +318,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -334,7 +334,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -343,8 +343,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-features-ndr-lat50}
-            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-2t1c-features-ndr-lat}
+            \label{fig:ip4-3n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -359,7 +359,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -368,8 +368,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-features-ndr-lat50}
-            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-x710-64b-4t2c-features-ndr-lat}
+            \label{fig:ip4-3n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -387,7 +387,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -396,8 +396,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -412,7 +412,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -421,8 +421,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -437,7 +437,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -446,8 +446,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat50}
-            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
+            \label{fig:ip4-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -462,7 +462,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -471,8 +471,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat50}
-            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
+            \label{fig:ip4-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -490,7 +490,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -499,8 +499,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -515,7 +515,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -524,8 +524,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -540,7 +540,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -549,8 +549,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-features-ndr-lat50}
-            \label{fig:ip4-2n-skx-x710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-2t1c-features-ndr-lat}
+            \label{fig:ip4-2n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -565,7 +565,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -574,8 +574,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-features-ndr-lat50}
-            \label{fig:ip4-2n-skx-x710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-x710-64b-4t2c-features-ndr-lat}
+            \label{fig:ip4-2n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -593,7 +593,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -602,8 +602,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -618,7 +618,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -627,8 +627,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -643,7 +643,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -652,8 +652,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat50}
-            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat}
+            \label{fig:ip4-2n-skx-xxv710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -668,7 +668,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -677,6 +677,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat50}
-            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat}
+            \label{fig:ip4-2n-skx-xxv710-64b-4t2c-features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
index 1957576c01..e45755e684 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -78,7 +78,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -87,8 +87,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -103,7 +103,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -112,8 +112,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -131,7 +131,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -140,8 +140,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -156,7 +156,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -165,8 +165,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -184,7 +184,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -193,8 +193,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -209,7 +209,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -218,8 +218,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -237,7 +237,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -246,8 +246,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -262,7 +262,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -271,8 +271,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -290,7 +290,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -299,8 +299,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -315,7 +315,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -324,6 +324,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip4tun-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
index 4213439c84..4640d6ed7a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-1t1c-features
@@ -75,7 +75,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -84,8 +84,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
+            \label{fig:ip6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
     \end{figure}
 
 78b-2t2c-features
@@ -100,7 +100,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -109,8 +109,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
+            \label{fig:ip6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -128,7 +128,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -137,8 +137,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-x710-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t2c-base_and_scale
@@ -153,7 +153,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -162,8 +162,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-x710-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-1t1c-features
@@ -178,7 +178,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -187,8 +187,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat}
+            \label{fig:ip6-3n-hsw-x710-78b-1t1c-features-ndr-lat}
     \end{figure}
 
 78b-2t2c-features
@@ -203,7 +203,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -212,8 +212,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat50}
-            \label{fig:ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat}
+            \label{fig:ip6-3n-hsw-x710-78b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -231,7 +231,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -240,8 +240,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t2c-base_and_scale
@@ -256,7 +256,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -265,8 +265,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -284,7 +284,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -293,8 +293,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-4t2c-base_and_scale
@@ -309,7 +309,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -318,8 +318,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t1c-features
@@ -334,7 +334,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -343,8 +343,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-features-ndr-lat50}
-            \label{fig:ip6-3n-skx-x710-78b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-2t1c-features-ndr-lat}
+            \label{fig:ip6-3n-skx-x710-78b-2t1c-features-ndr-lat}
     \end{figure}
 
 78b-4t2c-features
@@ -359,7 +359,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-x710-78b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -368,8 +368,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-features-ndr-lat50}
-            \label{fig:ip6-3n-skx-x710-78b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-x710-78b-4t2c-features-ndr-lat}
+            \label{fig:ip6-3n-skx-x710-78b-4t2c-features-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -387,7 +387,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -396,8 +396,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-4t2c-base_and_scale
@@ -412,7 +412,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -421,8 +421,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t1c-features
@@ -437,7 +437,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -446,8 +446,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat50}
-            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat}
+            \label{fig:ip6-3n-skx-xxv710-78b-2t1c-features-ndr-lat}
     \end{figure}
 
 78b-4t2c-features
@@ -462,7 +462,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -471,8 +471,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat50}
-            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat}
+            \label{fig:ip6-3n-skx-xxv710-78b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -490,7 +490,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -499,8 +499,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-2n-skx-x710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-4t2c-base_and_scale
@@ -515,7 +515,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -524,8 +524,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-2n-skx-x710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t1c-features
@@ -540,7 +540,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -549,8 +549,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-2t1c-features-ndr-lat50}
-            \label{fig:ip6-2n-skx-x710-78b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-2t1c-features-ndr-lat}
+            \label{fig:ip6-2n-skx-x710-78b-2t1c-features-ndr-lat}
     \end{figure}
 
 78b-4t2c-features
@@ -565,7 +565,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-x710-78b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -574,8 +574,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-features-ndr-lat50}
-            \label{fig:ip6-2n-skx-x710-78b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-x710-78b-4t2c-features-ndr-lat}
+            \label{fig:ip6-2n-skx-x710-78b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -593,7 +593,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -602,8 +602,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-4t2c-base_and_scale
@@ -618,7 +618,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -627,8 +627,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t1c-features
@@ -643,7 +643,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -652,8 +652,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat50}
-            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat}
+            \label{fig:ip6-2n-skx-xxv710-78b-2t1c-features-ndr-lat}
     \end{figure}
 
 78b-4t2c-features
@@ -668,7 +668,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -677,6 +677,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat50}
-            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat}
+            \label{fig:ip6-2n-skx-xxv710-78b-4t2c-features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
index dbbb592446..d86db3e45d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6_tunnels.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 78b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,6 +59,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
index 76759ac5e3..bd7a871c1b 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
@@ -28,7 +28,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -37,8 +37,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:ipsec-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -53,7 +53,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -62,6 +62,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:ipsec-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
index 8edabac932..4638ef2325 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,8 +59,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-features
@@ -75,7 +75,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -84,8 +84,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-1t1c-features-ndr-lat}
     \end{figure}
 
 64b-2t2c-features
@@ -100,7 +100,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -109,8 +109,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x520-64b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -128,7 +128,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -137,8 +137,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -153,7 +153,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -162,8 +162,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-features
@@ -178,7 +178,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -187,8 +187,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x710-64b-1t1c-features-ndr-lat}
     \end{figure}
 
 64b-2t2c-features
@@ -203,7 +203,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -212,8 +212,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat}
+            \label{fig:l2sw-3n-hsw-x710-64b-2t2c-features-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -231,7 +231,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -240,8 +240,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale
@@ -256,7 +256,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -265,8 +265,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-skx-x710
@@ -284,7 +284,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -293,8 +293,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -309,7 +309,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -318,8 +318,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -334,7 +334,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -343,8 +343,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat50}
-            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat}
+            \label{fig:l2sw-3n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -359,7 +359,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -368,8 +368,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat50}
-            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat}
+            \label{fig:l2sw-3n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 3n-skx-xxv710
@@ -387,7 +387,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -396,8 +396,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -412,7 +412,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -421,8 +421,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -437,7 +437,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -446,8 +446,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat50}
-            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -462,7 +462,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -471,8 +471,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat50}
-            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
+            \label{fig:l2sw-3n-skx-xxv710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-x710
@@ -490,7 +490,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -499,8 +499,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-2n-skx-x710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -515,7 +515,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -524,8 +524,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-2n-skx-x710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -540,7 +540,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -549,8 +549,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat50}
-            \label{fig:l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat}
+            \label{fig:l2sw-2n-skx-x710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -565,7 +565,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -574,8 +574,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat50}
-            \label{fig:l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat}
+            \label{fig:l2sw-2n-skx-x710-64b-4t2c-features-ndr-lat}
     \end{figure}
 
 2n-skx-xxv710
@@ -593,7 +593,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -602,8 +602,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-4t2c-base_and_scale
@@ -618,7 +618,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -627,8 +627,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
-            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
+            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t1c-features
@@ -643,7 +643,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -652,8 +652,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat50}
-            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat}
+            \label{fig:l2sw-2n-skx-xxv710-64b-2t1c-features-ndr-lat}
     \end{figure}
 
 64b-4t2c-features
@@ -668,7 +668,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -677,6 +677,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat50}
-            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat}
+            \label{fig:l2sw-2n-skx-xxv710-64b-4t2c-features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
index 6ac86f25cf..2cb010f8b1 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6.rst
@@ -25,7 +25,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -34,8 +34,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat50}
-            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
+            \label{fig:srv6-3n-hsw-x520-78b-1t1c-features-ndr-lat}
     \end{figure}
 
 78b-2t2c-features
@@ -50,7 +50,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -59,6 +59,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat50}
-            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
+            \label{fig:srv6-3n-hsw-x520-78b-2t2c-features-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
index 303f421f44..dbeca9e75b 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost.rst
@@ -1,5 +1,5 @@
-KVM VM vHost
-============
+KVM VMs vhost-user
+==================
 
 This section includes summary graphs of VPP Phy-to-VM(s)-to-Phy packet
 latency with with VM virtio and VPP vhost-user virtual interfaces
@@ -26,7 +26,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -35,8 +35,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-l2sw
@@ -51,7 +51,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -60,8 +60,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-base_and_scale-ip4
@@ -76,7 +76,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -85,8 +85,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-x520-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-ip4
@@ -101,7 +101,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -110,8 +110,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-x520-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-x710
@@ -129,7 +129,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -138,8 +138,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-l2sw
@@ -154,7 +154,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -163,8 +163,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-base_and_scale-ip4
@@ -179,7 +179,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -188,8 +188,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-x710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-ip4
@@ -204,7 +204,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -213,8 +213,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-x710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 3n-hsw-xl710
@@ -232,7 +232,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -241,8 +241,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-l2sw
@@ -257,7 +257,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -266,8 +266,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-l2sw-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-1t1c-base_and_scale-ip4
@@ -282,7 +282,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -291,8 +291,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr-lat}
     \end{figure}
 
 64b-2t2c-base_and_scale-ip4
@@ -307,7 +307,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -316,6 +316,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
-            \label{fig:vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
+            \label{fig:vhost-ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
index 4eb2147549..977b926dcf 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts.rst
@@ -26,7 +26,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-1t1c-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-1t1c-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -35,8 +35,8 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-1t1c-ndr-lat50}
-            \label{fig:vts-3n-hsw-x520-64b-1t1c-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-1t1c-ndr-lat}
+            \label{fig:vts-3n-hsw-x520-64b-1t1c-ndr-lat}
     \end{figure}
 
 64b-2t2c
@@ -51,7 +51,7 @@ CSIT source code for the test cases used for plots can be found in
 .. raw:: html
 
     </b>
-    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-2t2c-ndr-lat50.html"></iframe>
+    <iframe width="700" height="1000" frameborder="0" scrolling="no" src="../../_static/vpp/vts-3n-hsw-x520-64b-2t2c-ndr-lat.html"></iframe>
     <p><br><br></p>
     </center>
 
@@ -60,6 +60,6 @@ CSIT source code for the test cases used for plots can be found in
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-2t2c-ndr-lat50}
-            \label{fig:vts-3n-hsw-x520-64b-2t2c-ndr-lat50}
+            \includegraphics[clip, trim=0cm 8cm 5cm 0cm, width=0.70\textwidth]{vts-3n-hsw-x520-64b-2t2c-ndr-lat}
+            \label{fig:vts-3n-hsw-x520-64b-2t2c-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
index ed0b6cc10d..2029254974 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost.rst
@@ -1,5 +1,5 @@
-KVM VM vHost
-============
+KVM VMs vhost-user
+==================
 
 Following sections include summary graphs of VPP Phy-to-VM(s)-to-Phy
 performance with VM virtio and VPP vhost-user virtual interfaces,
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
index 6d1880e799..6902c1b25b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost.rst
@@ -1,5 +1,5 @@
-KVM VM vHost
-============
+KVM VMs vhost-user
+==================
 
 Following sections include Throughput Speedup Analysis for VPP multi-
 core multi-thread configurations with no Hyper-Threading, specifically