CSIT-1440: Re-organize graphs in report

- fixes

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

10 files changed, 227 insertions, 266 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst
index 21a7d4056d..bdf4adba5e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-x710.rst
@@ -31,13 +31,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base
--------------
+64b-2t1c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base-ndr}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_features-ndr}
+            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-2t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base-pdr}
-            \label{fig:memif-2n-skx-x710-64b-2t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-2t1c-base_and_features-pdr}
+            \label{fig:memif-2n-skx-x710-64b-2t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base
--------------
+64b-4t2c-base_and_features
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base-ndr}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_features-ndr}
+            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/memif-2n-skx-x710-64b-4t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base-pdr}
-            \label{fig:memif-2n-skx-x710-64b-4t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{memif-2n-skx-x710-64b-4t2c-base_and_features-pdr}
+            \label{fig:memif-2n-skx-x710-64b-4t2c-base_and_features-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
index 48caa9342e..3372ba3f6a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-base_and_scale
------------------------
+64b-1t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm41" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base-ndr}
+            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm42" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-1t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-1t1c-base-pdr}
+            \label{fig:ip4-3n-hsw-xl710-64b-1t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base_and_scale
------------------------
+64b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm43" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base-ndr}
+            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm44" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip4-3n-hsw-xl710-64b-2t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
-            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip4-3n-hsw-xl710-64b-2t2c-base-pdr}
+            \label{fig:ip4-3n-hsw-xl710-64b-2t2c-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst
index 226030c546..204b3493fd 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-78b-1t1c-base_and_scale
------------------------
+78b-1t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base-ndr}
+            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base-pdr}
+            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-base_and_scale
------------------------
+78b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base-ndr}
+            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,92 +109,10 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base-pdr}
+            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
-
-78b-1t1c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm05" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm06" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-1t1c-base_and_features-pdr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-78b-2t2c-base_and_features
---------------------------
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm07" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_features-ndr}
-    \end{figure}
-
-.. raw:: latex
-
-    \clearpage
-
-.. raw:: html
-
-    <center>
-    <iframe id="ifrm08" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr.html"></iframe>
-    <p><br></p>
-    </center>
-
-.. raw:: latex
-
-    \begin{figure}[H]
-        \centering
-            \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr}
-            \label{fig:ip6-3n-hsw-x520-78b-2t2c-base_and_features-pdr}
-    \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
index d81bf28ad0..a86321d84a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
@@ -31,13 +31,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-1t1c-base_and_scale
------------------------
+78b-1t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base-ndr}
+            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-1t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
+            \label{fig:ip6-3n-hsw-xl710-78b-1t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-base_and_scale
------------------------
+78b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr}
-            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base-ndr}
+            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6-3n-hsw-xl710-78b-2t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr}
-            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6-3n-hsw-xl710-78b-2t2c-base-pdr}
+            \label{fig:ip6-3n-hsw-xl710-78b-2t2c-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst
index a591bf3cc9..9633fd4a90 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6_tunnels-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-78b-1t1c-base_and_scale
------------------------
+78b-1t1c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base-ndr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-1t1c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-1t1c-base-pdr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-1t1c-base-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-base_and_scale
------------------------
+78b-2t2c-base
+-------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base-ndr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/ip6tun-3n-hsw-x520-78b-2t2c-base-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,6 +109,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
-            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base_and_scale-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{ip6tun-3n-hsw-x520-78b-2t2c-base-pdr}
+            \label{fig:ip6tun-3n-hsw-x520-78b-2t2c-base-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst
index c780675435..b4d71f8201 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-x710.rst
@@ -31,13 +31,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base-l2sw
-------------------
+64b-2t1c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm65" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm65" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm66" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm66" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-2t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base-l2sw
-------------------
+64b-4t2c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm67" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm67" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm68" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm68" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr}
-            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-2n-skx-x710-64b-4t2c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
index 01d315698e..8b41fb8476 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
@@ -31,13 +31,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-base-l2sw
-------------------
+64b-2t1c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm81" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm81" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm82" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm82" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-2t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base-l2sw
-------------------
+64b-4t2c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm83" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm83" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm84" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm84" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr}
-            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-2n-skx-xxv710-64b-4t2c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst
index 3f61438329..8f9ef128f0 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x520.rst
@@ -31,13 +31,13 @@
 3n-hsw-x520
 ~~~~~~~~~~~
 
-64b-1t1c-base-l2sw
-------------------
+64b-1t1c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-1t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base-l2sw
-------------------
+64b-2t2c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm04" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x520-64b-2t2c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst
index 1e462c3c2b..fc4ddb9f5d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-x710.rst
@@ -31,13 +31,13 @@
 3n-hsw-x710
 ~~~~~~~~~~~
 
-64b-1t1c-base-l2sw
-------------------
+64b-1t1c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm17" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm18" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base-l2sw
-------------------
+64b-2t2c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm19" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm20" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +109,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-base-vm-l2sw
----------------------
+64b-2t2c-base_and_features-vm-l2sw
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr.html"></iframe>
+    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr.html"></iframe>
+    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,8 +152,51 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base-vm-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-2t2c-base_and_features-vm-pdr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+64b-1t1c-base_and_features-vm-l2sw
+----------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm27" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-ndr}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+.. raw:: html
+
+    <center>
+    <iframe id="ifrm28" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr.html"></iframe>
+    <p><br></p>
+    </center>
+
+.. raw:: latex
+
+    \begin{figure}[H]
+        \centering
+            \graphicspath{{../_build/_static/vpp/}}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr}
+            \label{fig:vhost-l2sw-3n-hsw-x710-64b-1t1c-base_and_features-vm-pdr}
     \end{figure}
 
 .. raw:: latex
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
index 6dc31596d3..7b4e72d3df 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
@@ -31,13 +31,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-base-l2sw
-------------------
+64b-2t1c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm49" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr.html"></iframe>
+    <iframe id="ifrm49" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -46,8 +46,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -57,7 +57,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm50" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr.html"></iframe>
+    <iframe id="ifrm50" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,21 +66,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base-l2sw
-------------------
+64b-4t2c-base_and_features-l2sw
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm51" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr.html"></iframe>
+    <iframe id="ifrm51" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm52" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr.html"></iframe>
+    <iframe id="ifrm52" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,21 +109,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-base-vm-l2sw
----------------------
+64b-2t1c-base_and_features-vm-l2sw
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm57" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr.html"></iframe>
+    <iframe id="ifrm57" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,8 +132,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm58" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr.html"></iframe>
+    <iframe id="ifrm58" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -152,21 +152,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base-vm-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-2t1c-base_and_features-vm-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-base-vm-l2sw
----------------------
+64b-4t2c-base_and_features-vm-l2sw
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="ifrm59" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr.html"></iframe>
+    <iframe id="ifrm59" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,8 +175,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="ifrm60" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr.html"></iframe>
+    <iframe id="ifrm60" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,8 +195,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr}
-            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base-vm-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr}
+            \label{fig:vhost-l2sw-3n-skx-x710-64b-4t2c-base_and_features-vm-pdr}
     \end{figure}
 
 .. raw:: latex