Report: ixgbe for tsh

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

34 files changed, 521 insertions, 493 deletions

diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-tsh-x520.rst
index 1473a2cfdc..7ee3922419 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/container_memif-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-ixgbe
     10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-memif-base-i40e
-------------------------
+64b-1t1c-memif-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,21 +61,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-memif-base-i40e
-------------------------
+64b-2t2c-memif-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-memif-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-memif-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -84,21 +84,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-memif-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-memif-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-memif-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-memif-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-memif-base-i40e
-------------------------
+64b-4t4c-memif-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-memif-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-memif-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,6 +107,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-memif-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-memif-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-memif-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-memif-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst
index bc005754b1..4a675250a2 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-skx-xxv710.rst
@@ -43,7 +43,7 @@
     10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-feature-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-i40e
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -192,13 +192,13 @@
 
     \clearpage
 
-64b-2t1c-feature-ip4routing-base-i40e
+64b-2t1c-features-ip4routing-base-i40e
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -207,21 +207,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t2c-feature-ip4routing-base-i40e
+64b-4t2c-features-ip4routing-base-i40e
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -230,21 +230,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-8t4c-feature-ip4routing-base-i40e
+64b-8t4c-features-ip4routing-base-i40e
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -253,6 +253,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-8t4c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-features-ip4routing-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-tsh-x520.rst
index 951ddb3d26..a0e9fe6bc2 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 
 ..
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4scale20k-ndrpdr
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-feature-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-ixgbe
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -60,13 +60,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-ip4routing-base-scale-i40e
------------------------------------
+64b-1t1c-ip4routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,21 +75,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-ip4routing-base-scale-i40e
------------------------------------
+64b-2t2c-ip4routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-ip4routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -98,21 +98,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-ip4routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-ip4routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-ip4routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-ip4routing-base-scale-i40e
------------------------------------
+64b-4t4c-ip4routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-ip4routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -121,21 +121,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-ip4routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-ip4routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-ip4routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-feature-ip4routing-base-i40e
--------------------------------------
+64b-1t1c-features-ip4routing-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -144,21 +144,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-feature-ip4routing-base-i40e
--------------------------------------
+64b-2t2c-features-ip4routing-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-features-ip4routing-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -167,21 +167,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-features-ip4routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-features-ip4routing-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-feature-ip4routing-base-i40e
--------------------------------------
+64b-4t4c-features-ip4routing-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-feature-ip4routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-features-ip4routing-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -190,6 +190,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-feature-ip4routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-feature-ip4routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-features-ip4routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-features-ip4routing-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-tsh-x520.rst
index 547369f394..2b5946183a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip4_tunnels-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-ip4tunnel-base-scale-i40e
+    ### 64b-?t?c-ip4tunnel-base-scale-ixgbe
     10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
@@ -43,13 +43,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-ip4tunnel-base-scale-i40e
-----------------------------------
+64b-1t1c-ip4tunnel-base-scale-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -58,21 +58,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-ip4tunnel-base-scale-i40e
-----------------------------------
+64b-2t2c-ip4tunnel-base-scale-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,21 +81,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-ip4tunnel-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-ip4tunnel-base-scale-i40e
-----------------------------------
+64b-4t4c-ip4tunnel-base-scale-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -104,6 +104,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-ip4tunnel-base-scale-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-tsh-x520.rst
index a9fd26cb4e..3b3326bd9b 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ip6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-1t1c-ip6routing-base-scale-i40e
------------------------------------
+78b-1t1c-ip6routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,21 +61,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-ip6routing-base-scale-i40e
------------------------------------
+78b-2t2c-ip6routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-2t2c-ip6routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -84,21 +84,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-2t2c-ip6routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-2t2c-ip6routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-2t2c-ip6routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t4c-ip6routing-base-scale-i40e
------------------------------------
+78b-4t4c-ip6routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-4t4c-ip6routing-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,6 +107,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-4t4c-ip6routing-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-4t4c-ip6routing-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-4t4c-ip6routing-base-scale-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-tsh-x520.rst
index 808c010031..4518dabd2d 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-ixgbe
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
----------------------------------------------
+imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe
+----------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,18 +63,44 @@ imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
-            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
+imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe
+----------------------------------------------
+
+.. raw:: html
+
+    <center>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat.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]{3n-tsh-x520-imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-imix-2t2c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat}
+    \end{figure}
+
+.. raw:: latex
+
+    \clearpage
+
+imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe
+----------------------------------------------
+
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +109,7 @@ imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
-            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-imix-4t4c-ipsec-ip4routing-base-scale-sw-ixgbe-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 fe0d054a5d..2a0233a942 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/ipsec.rst
@@ -22,3 +22,4 @@ CSIT source code for the test cases used for plots can be found in
 
     ipsec-3n-skx-xxv710
     ipsec-3n-hsw-xl710
+    ipsec-3n-tsh-x520
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
index 861808fce9..0c84fa8a53 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-skx-xxv710.rst
@@ -49,7 +49,7 @@
     10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-?t?c-feature-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-i40e
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -267,13 +267,13 @@
 
     \clearpage
 
-64b-2t1c-feature-l2switching-base-i40e
+64b-2t1c-features-l2switching-base-i40e
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -282,8 +282,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
@@ -291,13 +291,13 @@
     \clearpage
 
 
-64b-4t2c-feature-l2switching-base-i40e
+64b-4t2c-features-l2switching-base-i40e
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-4t2c-features-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -306,8 +306,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-4t2c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-4t2c-features-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-4t2c-features-l2switching-base-i40e-ndr-lat}
     \end{figure}
 
 .. raw:: latex
@@ -315,13 +315,13 @@
     \clearpage
 
 
-64b-8t4c-feature-l2switching-base-i40e
+64b-8t4c-features-l2switching-base-i40e
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-8t4c-features-l2switching-base-i40e-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -330,6 +330,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-skx-xxv710-64b-8t4c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-8t4c-features-l2switching-base-i40e-ndr-lat}
+            \label{fig:3n-skx-xxv710-64b-8t4c-features-l2switching-base-i40e-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-tsh-x520.rst
index 86fb62fc99..960afaf088 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/l2-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr
@@ -41,7 +41,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-ixgbe
     10ge2p1x520-eth-l2patch-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
@@ -56,7 +56,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-?t?c-feature-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-ixgbe
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -74,13 +74,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-l2switching-base-i40e
-------------------------------
+64b-1t1c-l2switching-base-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,21 +89,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-l2switching-base-i40e
-------------------------------
+64b-2t2c-l2switching-base-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -112,21 +112,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-l2switching-base-i40e
-------------------------------
+64b-4t4c-l2switching-base-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -135,21 +135,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-l2switching-base-scale-i40e
-------------------------------------
+64b-1t1c-l2switching-base-scale-ixgbe
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -158,21 +158,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-l2switching-base-scale-i40e
-------------------------------------
+64b-2t2c-l2switching-base-scale-ixgbe
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-l2switching-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -181,21 +181,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-l2switching-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-l2switching-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-l2switching-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-l2switching-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-l2switching-base-scale-i40e
-------------------------------------
+64b-4t4c-l2switching-base-scale-ixgbe
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-l2switching-base-scale-i40e-ndr-lat.html"></iframe>
+    <iframe id="23" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-l2switching-base-scale-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -204,21 +204,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-l2switching-base-scale-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-l2switching-base-scale-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-l2switching-base-scale-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-l2switching-base-scale-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-feature-l2switching-base-i40e
---------------------------------------
+64b-1t1c-features-l2switching-base-ixgbe
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -227,21 +227,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-feature-l2switching-base-i40e
---------------------------------------
+64b-2t2c-features-l2switching-base-ixgbe
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-features-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -250,21 +250,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-features-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-features-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-feature-l2switching-base-i40e
---------------------------------------
+64b-4t4c-features-l2switching-base-ixgbe
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-feature-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="33" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-features-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -273,6 +273,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-feature-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-feature-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-features-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-features-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-tsh-x520.rst
index 2710772d47..25e33f9ce6 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/srv6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    ### 78b-?t?c-srv6-ip6routing-base-ixgbe
     10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-1t1c-srv6-ip6routing-base-i40e
-----------------------------------
+78b-1t1c-srv6-ip6routing-base-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,21 +63,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-2t2c-srv6-ip6routing-base-i40e
-----------------------------------
+78b-2t2c-srv6-ip6routing-base-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -86,21 +86,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-2t2c-srv6-ip6routing-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-78b-4t4c-srv6-ip6routing-base-i40e
-----------------------------------
+78b-4t4c-srv6-ip6routing-base-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-ixgbe-ndr-lat.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]{3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-78b-4t4c-srv6-ip6routing-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-tsh-x520.rst
index 7a6148929b..6cfa56307a 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vm_vhost-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -43,7 +43,7 @@
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-ixgbe
     10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -61,13 +61,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-vhost-base-i40e
-------------------------
+64b-1t1c-vhost-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,21 +76,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-vhost-base-i40e
-------------------------
+64b-2t2c-vhost-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -99,21 +99,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-vhost-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-vhost-base-i40e
-------------------------
+64b-4t4c-vhost-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -122,17 +122,17 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-vhost-base-ixgbe-ndr-lat}
     \end{figure}
 
-64b-1t1c-link-bonding-vhost-base-i40e
--------------------------------------
+64b-1t1c-link-bonding-vhost-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -141,21 +141,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t2c-link-bonding-vhost-base-i40e
--------------------------------------
+64b-2t2c-link-bonding-vhost-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -164,21 +164,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-2t2c-link-bonding-vhost-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-4t4c-link-bonding-vhost-base-i40e
--------------------------------------
+64b-4t4c-link-bonding-vhost-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="13" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -187,6 +187,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-64b-4t4c-link-bonding-vhost-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-tsh-x520.rst
index ad7dd4d78d..621f744d78 100644
--- a/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_latency_graphs/vts-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vts-l2switching-base-i40e
+    ### 64b-?t?c-vts-l2switching-base-ixgbe
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -42,13 +42,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-114b-1t1c-vts-l2switching-base-i40e
------------------------------------
+114b-1t1c-vts-l2switching-base-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,21 +57,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-114b-2t2c-vts-l2switching-base-i40e
------------------------------------
+114b-2t2c-vts-l2switching-base-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-2t2c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -80,21 +80,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-2t2c-vts-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-114b-2t2c-vts-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-114b-2t2c-vts-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-114b-4t4c-vts-l2switching-base-i40e
------------------------------------
+114b-4t4c-vts-l2switching-base-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-4t4c-vts-l2switching-base-i40e-ndr-lat.html"></iframe>
+    <iframe id="03" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe-ndr-lat.html"></iframe>
     <p><br></p>
     </center>
 
@@ -103,6 +103,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-4t4c-vts-l2switching-base-i40e-ndr-lat}
-            \label{fig:3n-tsh-x520-114b-4t4c-vts-l2switching-base-i40e-ndr-lat}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe-ndr-lat}
+            \label{fig:3n-tsh-x520-114b-4t4c-vts-l2switching-base-ixgbe-ndr-lat}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-tsh-x520.rst
index f4be323950..d774fb06d3 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-ixgbe
     10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-memif-base-i40e
-------------------------
+64b-1t1c-memif-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-memif-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-memif-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-memif-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
index 6a8f6dd031..8a41e21229 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-xxv710.rst
@@ -54,7 +54,7 @@
     Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-feature-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-i40e
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -158,13 +158,13 @@
 
     \clearpage
 
-64b-2t1c-feature-ip4routing-base-i40e
+64b-2t1c-features-ip4routing-base-i40e
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -173,8 +173,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -184,7 +184,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -193,6 +193,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-ip4routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-tsh-x520.rst
index b7e7814c17..0d79aef736 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 
 ..
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4scale20k-ndrpdr
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-feature-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-ixgbe
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -60,13 +60,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-ip4routing-base-scale-i40e
------------------------------------
+64b-1t1c-ip4routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,8 +75,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -86,7 +86,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -95,21 +95,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4routing-base-scale-ixgbe-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-feature-ip4routing-base-i40e
--------------------------------------
+64b-1t1c-features-ip4routing-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -118,8 +118,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -129,7 +129,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,6 +138,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-ip4routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-ip4routing-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-tsh-x520.rst
index d0886482b2..de5992a638 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-ip4tunnel-base-scale-i40e
+    ### 64b-?t?c-ip4tunnel-base-scale-ixgbe
     10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
@@ -43,13 +43,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-ip4tunnel-base-scale-i40e
-----------------------------------
+64b-1t1c-ip4tunnel-base-scale-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -58,8 +58,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -69,7 +69,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -78,6 +78,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-ip4tunnel-base-scale-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-tsh-x520.rst
index e28531a057..19e8514843 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-1t1c-ip6routing-base-scale-i40e
------------------------------------
+78b-1t1c-ip6routing-base-scale-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-78b-1t1c-ip6routing-base-scale-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-tsh-x520.rst
index 808c010031..545ed0589d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-ixgbe
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
----------------------------------------------
+imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe
+----------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@ imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
-            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@ imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@ imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
-            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-imix-1t1c-ipsec-ip4routing-base-scale-sw-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
index be9e4a81e1..18ddb7680e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-xxv710.rst
@@ -65,7 +65,7 @@
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale100kmaclrn-ndrpdr
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-2t1c-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-?t?c-feature-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-i40e
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -212,13 +212,13 @@
 
     \clearpage
 
-64b-2t1c-feature-l2switching-base-i40e
+64b-2t1c-features-l2switching-base-i40e
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -227,8 +227,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -238,7 +238,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -247,6 +247,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-feature-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-tsh-x520.rst
index 20891148cf..b0b8625fc4 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr
@@ -41,7 +41,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-ixgbe
     10ge2p1x520-eth-l2patch-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
@@ -56,7 +56,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-?t?c-feature-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-ixgbe
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -74,13 +74,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-l2switching-base-i40e
-------------------------------
+64b-1t1c-l2switching-base-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-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]{3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-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]{3n-tsh-x520-64b-1t1c-l2switching-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-ixgbe-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-l2switching-base-scale-i40e
-------------------------------------
+64b-1t1c-l2switching-base-scale-ixgbe
+-------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-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]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-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]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-l2switching-base-scale-ixgbe-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-feature-l2switching-base-i40e
---------------------------------------
+64b-1t1c-features-l2switching-base-ixgbe
+---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-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]{3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +195,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-feature-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-features-l2switching-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-tsh-x520.rst
index 7ba6d363f9..ee4f136ebb 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    ### 78b-?t?c-srv6-ip6routing-base-ixgbe
     10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-1t1c-srv6-ip6routing-base-i40e
-----------------------------------
+78b-1t1c-srv6-ip6routing-base-ixgbe
+-----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-78b-1t1c-srv6-ip6routing-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-tsh-x520.rst
index 0efb9e9d5c..633d4a9347 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -43,7 +43,7 @@
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-ixgbe
     10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -61,13 +61,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-1t1c-vhost-base-i40e
-------------------------
+64b-1t1c-vhost-base-ixgbe
+-------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,8 +76,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -87,7 +87,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -96,21 +96,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-vhost-base-ixgbe-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-link-bonding-vhost-base-i40e
--------------------------------------
+64b-1t1c-link-bonding-vhost-base-ixgbe
+--------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -119,8 +119,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -130,7 +130,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -139,6 +139,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-64b-1t1c-link-bonding-vhost-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-tsh-x520.rst
index ac2b4d3a81..948652ccca 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vts-l2switching-base-i40e
+    ### 64b-?t?c-vts-l2switching-base-ixgbe
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -42,13 +42,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-114b-1t1c-vts-l2switching-base-i40e
------------------------------------
+114b-1t1c-vts-l2switching-base-ixgbe
+------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,8 +57,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr}
-            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr}
+            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -68,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -77,6 +77,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-pdr}
-            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-pdr}
+            \label{fig:3n-tsh-x520-114b-1t1c-vts-l2switching-base-ixgbe-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-tsh-x520.rst
index 3a5560576e..304088551c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-ixgbe
     10ge2p1x520-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-memif-base-i40e
--------------------
+64b-memif-base-ixgbe
+--------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-memif-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-memif-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-memif-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-memif-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-memif-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-memif-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-memif-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-memif-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-memif-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-memif-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-memif-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-memif-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
index e513173980..f5ab279ec2 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-xxv710.rst
@@ -43,7 +43,7 @@
     10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-feature-ip4routing-base-i40e
+    ### 64b-features-ip4routing-base-i40e
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -140,13 +140,13 @@
 
     \clearpage
 
-64b-feature-ip4routing-base-i40e
+64b-features-ip4routing-base-i40e
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -155,8 +155,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-feature-ip4routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -166,7 +166,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -175,6 +175,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-feature-ip4routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-tsh-x520.rst
index efed8c71f4..779736ef4f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 
 ..
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4-ip4scale20k-ndrpdr
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale200K-Ndrpdr.64B-1t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.10Ge2P1X520-Ethip4-Ip4Scale2M-Ndrpdr.64B-1t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-feature-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-ixgbe
     10ge2p1x520-ethip4-ip4base-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -60,13 +60,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-i40e
-------------------------------
+64b-ip4routing-base-scale-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4routing-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,8 +75,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -86,7 +86,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4routing-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -95,21 +95,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-ip4routing-base-scale-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-feature-ip4routing-base-i40e
---------------------------------
+64b-features-ip4routing-base-ixgbe
+---------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-feature-ip4routing-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-features-ip4routing-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -118,8 +118,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-feature-ip4routing-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-feature-ip4routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-features-ip4routing-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-features-ip4routing-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -129,7 +129,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-feature-ip4routing-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-features-ip4routing-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,6 +138,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-feature-ip4routing-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-feature-ip4routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-features-ip4routing-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-features-ip4routing-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-tsh-x520.rst
index 213002472d..caa839bdad 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-tsh-x520.rst
@@ -29,7 +29,7 @@
     </script>
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-ip4tunnel-base-scale-i40e
+    ### 64b-?t?c-ip4tunnel-base-scale-ixgbe
     10ge2p1x520-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
@@ -43,13 +43,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-ip4tunnel-base-scale-i40e
------------------------------
+64b-ip4tunnel-base-scale-ixgbe
+------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -58,8 +58,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -69,7 +69,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -78,6 +78,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-ip4tunnel-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-ip4tunnel-base-scale-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-tsh-x520.rst
index 801fcb6d1c..5f36974eac 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-ixgbe
     10ge2p1x520-dot1q-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6base-ndrpdr
     10ge2p1x520-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
-------------------------------
+78b-ip6routing-base-scale-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-ip6routing-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -61,8 +61,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-ip6routing-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -81,6 +81,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-78b-ip6routing-base-scale-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-tsh-x520.rst
index d5d9255f2b..11012ee1eb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-ixgbe
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1x520-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1x520-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-imix-ipsec-ip4routing-base-scale-sw-i40e
-----------------------------------------
+imix-ipsec-ip4routing-base-scale-sw-ixgbe
+-----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@ imix-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@ imix-ipsec-ip4routing-base-scale-sw-i40e
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@ imix-ipsec-ip4routing-base-scale-sw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-imix-ipsec-ip4routing-base-scale-sw-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
index 4e3da4723e..c667feb61a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-xxv710.rst
@@ -49,7 +49,7 @@
     10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-feature-l2switching-base-i40e
+    ###  64b-features-l2switching-base-i40e
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -189,13 +189,13 @@
 
     \clearpage
 
-64b-feature-l2switching-base-i40e
+64b-features-l2switching-base-i40e
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-i40e-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -204,8 +204,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-feature-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-i40e-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-i40e-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -215,7 +215,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-i40e-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -224,6 +224,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-feature-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-i40e-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-i40e-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-tsh-x520.rst
index ebcf0d2d65..089d24ea46 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-ndrpdr
@@ -41,7 +41,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdbasemaclrn-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-ixgbe
     10ge2p1x520-eth-l2patch-ndrpdr
     10ge2p1x520-eth-l2xcbase-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
@@ -56,7 +56,7 @@
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale100Kmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale100kmaclrn-ndrpdr
     Tests.Vpp.Perf.L2.10Ge2P1X520-Eth-L2Bdscale1Mmaclrn-Ndrpdr.64B-1t1c-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-?t?c-feature-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-ixgbe
     10ge2p1x520-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1x520-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -74,13 +74,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-l2switching-base-i40e
--------------------------
+64b-l2switching-base-ixgbe
+--------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -89,8 +89,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-l2switching-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-l2switching-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-ixgbe-pdr-tsa.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]{3n-tsh-x520-64b-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-l2switching-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-l2switching-base-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-l2switching-base-scale-i40e
--------------------------------
+64b-l2switching-base-scale-ixgbe
+--------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-scale-ixgbe-ndr-tsa.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]{3n-tsh-x520-64b-l2switching-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-l2switching-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-l2switching-base-scale-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-l2switching-base-scale-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-l2switching-base-scale-ixgbe-pdr-tsa.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]{3n-tsh-x520-64b-l2switching-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-l2switching-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-l2switching-base-scale-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-l2switching-base-scale-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-feature-l2switching-base-i40e
----------------------------------
+64b-features-l2switching-base-ixgbe
+----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-feature-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-features-l2switching-base-ixgbe-ndr-tsa.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]{3n-tsh-x520-64b-feature-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-feature-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-features-l2switching-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-features-l2switching-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-feature-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-features-l2switching-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,6 +195,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-feature-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-feature-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-features-l2switching-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-features-l2switching-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-tsh-x520.rst
index aa354b3f5d..4927066f2c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    ### 78b-?t?c-srv6-ip6routing-base-ixgbe
     10ge2p1x520-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1x520-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -48,13 +48,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-78b-srv6-ip6routing-base-i40e
------------------------------
+78b-srv6-ip6routing-base-ixgbe
+------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-srv6-ip6routing-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-srv6-ip6routing-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-78b-srv6-ip6routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-srv6-ip6routing-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-srv6-ip6routing-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-78b-srv6-ip6routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-78b-srv6-ip6routing-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-tsh-x520.rst
index b2b5c94dad..20f34f2036 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-ixgbe
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -43,7 +43,7 @@
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     Tests.Vpp.Perf.Vm Vhost.10Ge2P1X520-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Ndrpdr.64B-1t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-ndrpdr
 
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-ixgbe
     10ge2p1x520-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -61,13 +61,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-64b-vhost-base-i40e
--------------------
+64b-vhost-base-ixgbe
+--------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-vhost-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,8 +76,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-vhost-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -87,7 +87,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-vhost-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -96,21 +96,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-vhost-base-ixgbe-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-link-bonding-vhost-base-i40e
---------------------------------
+64b-link-bonding-vhost-base-ixgbe
+---------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-link-bonding-vhost-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -119,8 +119,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-link-bonding-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-64b-link-bonding-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -130,7 +130,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-link-bonding-vhost-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -139,6 +139,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-link-bonding-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-64b-link-bonding-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-64b-link-bonding-vhost-base-ixgbe-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-tsh-x520.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-tsh-x520.rst
index e8212d5853..cec9514ef1 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-tsh-x520.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-3n-tsh-x520.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-tsh-x520
-    ### 64b-?t?c-vts-l2switching-base-i40e
+    ### 64b-?t?c-vts-l2switching-base-ixgbe
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1x520-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -42,13 +42,13 @@
 3n-tsh-x520
 ~~~~~~~~~~~
 
-114b-vts-l2switching-base-i40e
------------------------------------
+114b-vts-l2switching-base-ixgbe
+-------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-vts-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-vts-l2switching-base-ixgbe-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -57,8 +57,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-vts-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-tsh-x520-114b-vts-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-vts-l2switching-base-ixgbe-ndr-tsa}
+            \label{fig:3n-tsh-x520-114b-vts-l2switching-base-ixgbe-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -68,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-vts-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-tsh-x520-114b-vts-l2switching-base-ixgbe-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -77,6 +77,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-vts-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-tsh-x520-114b-vts-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-tsh-x520-114b-vts-l2switching-base-ixgbe-pdr-tsa}
+            \label{fig:3n-tsh-x520-114b-vts-l2switching-base-ixgbe-pdr-tsa}
     \end{figure}