Report: Replace i40e by dpdk

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

77 files changed, 799 insertions, 799 deletions

diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-cx556a.rst
index 44cda904dc..6ef145a27d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-cx556a.rst
@@ -31,7 +31,7 @@
 2n-clx-cx556a
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-i40e
+64b-2t1c-memif-base-dpdk
 ------------------------
 
 .. raw:: html
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
index 56791a709e..c1c2bef70c 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -39,13 +39,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-i40e
+64b-2t1c-memif-base-dpdk
 ------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-memif-base-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -65,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-memif-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-memif-base-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst
index 0bb3a5369c..84fa409083 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -39,13 +39,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-i40e
+64b-2t1c-memif-base-dpdk
 ------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -65,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst
index df0a6ab31a..9f36ccae5b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/container_memif-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 64b-?t?c-memif-base-i40e
+    ### 64b-?t?c-memif-base-dpdk
     10ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -46,13 +46,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-i40e
+64b-2t1c-memif-base-dpdk
 ------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-dpdk-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-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-memif-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-dpdk-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-skx-xxv710-64b-2t1c-memif-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-memif-base-dpdk-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-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-memif-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
index c6150e03ec..edf4193cde 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/index.rst
@@ -95,7 +95,7 @@ Graphs are split into sections as follows:
    - **nic_driver**:
 
      - avf: VPP native avf driver for Intel Fortville NICs
-     - i40e: dpdk poll mode driver for Intel Fortville NICs
+     - dpdk: dpdk poll mode driver for Intel Fortville NICs
      - ixgbe: dpdk poll mode driver for Intel Niantic NICs
 
 For each test case, Box-and-Whisker plots show the quartiles (Min, 1st
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
index f6ce8f7da7..2957866d6f 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-x710
-    ###  64b-?t?c-ip4routing-base-scale-avf-i40e
+    ###  64b-?t?c-ip4routing-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -46,13 +46,13 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-avf-i40e
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
 ---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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]{2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
-            \label{fig:2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-ndr}
+            \label{fig:2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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/2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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]{2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr}
-            \label{fig:2n-clx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr}
+            \label{fig:2n-clx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
index 139215b7e8..6bda611f5a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-clx-xxv710.rst
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
@@ -55,7 +55,7 @@
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-features-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-dpdk
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -116,13 +116,13 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-i40e
+64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -131,8 +131,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -142,7 +142,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -151,21 +151,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-ip4routing-base-i40e
+64b-2t1c-features-ip4routing-base-dpdk
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -174,8 +174,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -185,7 +185,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -194,6 +194,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
index c6970d1702..6d7d94dc57 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-x710
-    ###  64b-?t?c-ip4routing-base-scale-avf-i40e
+    ###  64b-?t?c-ip4routing-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -46,13 +46,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-avf-i40e
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
 ---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
-            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-ndr}
+            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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/2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-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]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr}
-            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr}
+            \label{fig:2n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
index 4923ca7459..4c334f620d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-2n-skx-xxv710.rst
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
@@ -55,7 +55,7 @@
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.2N1L-25Ge2P1Xxv710-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-features-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-dpdk
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -116,13 +116,13 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-i40e
+64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -131,8 +131,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -142,7 +142,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -151,21 +151,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-ip4routing-base-i40e
+64b-2t1c-features-ip4routing-base-dpdk
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -174,8 +174,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -185,7 +185,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -194,6 +194,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
index 8f98984710..dc31acb1c8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-dpdk
     10ge2p1xl710-dot1q-ip4base-ndrpdr
     10ge2p1xl710-ethip4-ip4base-ndrpdr
     10ge2p1xl710-ethip4-ip4scale2m-ndrpdr
@@ -42,13 +42,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-ip4routing-base-scale-i40e
+64b-1t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-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-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-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-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-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-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst
index b59f9beac5..dce93dd0f8 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    ### 64b-?t?c-ip4routing-base-scale-avf-i40e
+    ### 64b-?t?c-ip4routing-base-scale-[avf,dpdk]
     10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -46,13 +46,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-ip4routing-base-scale-avf-i40e
+64b-2t1c-ip4routing-base-scale-[avf,dpdk]
 ---------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,7 +72,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-ip4routing-base-scale-[avf,dpdk]-pdr.html"></iframe>
     <p><br></p>
     </center>
 
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 62ad50e5d1..c66bcf6c47 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
@@ -41,7 +41,7 @@
     Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale200K-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale200k-ndrpdr
     Tests.Vpp.Perf.Ip4.25Ge2P1Xxv710-Avf-Ethip4-Ip4Scale2M-Ndrpdr.64B-2t1c-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-?t?c-ip4routing-base-scale-i40e
+    ### 64b-?t?c-ip4routing-base-scale-dpdk
     10ge2p1xxv710-dot1q-ip4base-ndrpdr
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
@@ -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-features-ip4routing-base-i40e
+    ### 64b-?t?c-features-ip4routing-base-dpdk
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -115,13 +115,13 @@
 
     \clearpage
 
-64b-2t1c-ip4routing-base-scale-i40e
+64b-2t1c-ip4routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -130,8 +130,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-ip4routing-base-scale-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -141,7 +141,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -150,21 +150,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-ip4routing-base-scale-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-ip4routing-base-i40e
+64b-2t1c-features-ip4routing-base-dpdk
 --------------------------------------
 
 .. raw:: html
 
     <center>
-    <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>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-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-features-ip4routing-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-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-features-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-dpdk-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-features-ip4routing-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-ip4routing-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
index 3c2f05ee93..3561f5ec99 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-?t?c-ip4tunnel-base-i40e
+    ### 64b-?t?c-ip4tunnel-base-dpdk
     10ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 
@@ -40,13 +40,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-ip4tunnel-base-i40e
+64b-1t1c-ip4tunnel-base-dpdk
 ----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-ip4tunnel-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
index 325c7cd78b..81b0dd9ef6 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip4_tunnels-3n-skx-xxv710.rst
@@ -29,7 +29,7 @@
     </script>
 ..
     ## 3n-skx-xxv710
-    ### 64b-?t?c-ip4tunnel-base-scale-i40e
+    ### 64b-?t?c-ip4tunnel-base-scale-dpdk
     10ge2p1xxv710-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
@@ -43,13 +43,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-ip4tunnel-base-scale-i40e
+64b-2t1c-ip4tunnel-base-scale-dpdk
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-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-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-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-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-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-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-ip4tunnel-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
index 94238e1c06..3821c3ff75 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-x710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
@@ -41,13 +41,13 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-clx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
index 4393ab4d72..5f9d8bb8f0 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
index e47c1b71e5..a1bc75b44e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-x710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
@@ -41,13 +41,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
index 566ada568a..5aeafb8f2e 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
index ae21b1ac7a..0f62273540 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     10ge2p1xl710-dot1q-ip6base-ndrpdr
     10ge2p1xl710-ethip6-ip6base-ndrpdr
     10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
@@ -42,13 +42,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-1t1c-ip6routing-base-scale-i40e
+78b-1t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -68,7 +68,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-1t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst
index ddcb96858f..21432894d5 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     10ge2p1x710-ethip6-ip6base-ndrpdr
     10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
@@ -41,13 +41,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-x710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst
index 6606da507e..026ae204ba 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ip6-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 78b-?t?c-ip6routing-base-scale-i40e
+    ### 78b-?t?c-ip6routing-base-scale-dpdk
     10ge2p1xxv710-dot1q-ip6base-ndrpdr
     10ge2p1xxv710-ethip6-ip6base-ndrpdr
     10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -46,13 +46,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-ip6routing-base-scale-i40e
+78b-2t1c-ip6routing-base-scale-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-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-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-ip6routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
index e97ea580ce..adc855f9e3 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-sw-dpdk
     10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -45,7 +45,7 @@
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes256Gcm-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
     Tests.Vpp.Perf.Crypto.40Ge2P1Xl710-Ethip4Ipsec10000Tnlsw-Ip4Base-Int-Aes128Cbc-Hmac512Sha-Ndrpdr.IMIX-1t1c-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 
-    ### imix-?t?c-ipsec-ip4routing-base-scale-hw-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-hw-dpdk
     10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr - missing
@@ -59,13 +59,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e
+imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk
 ---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,8 +74,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-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
-            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -85,7 +85,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-hsw-xl710-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-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -94,21 +94,21 @@ 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-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
-            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-sw-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
+imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk
 ---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -117,8 +117,8 @@ imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr}
-            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -128,7 +128,7 @@ imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -137,6 +137,6 @@ imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr}
-            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-imix-1t1c-ipsec-ip4routing-base-scale-hw-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
index ac381ca6fa..2b6765a0c4 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/ipsec-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### imix-?t?c-ipsec-ip4routing-base-scale-i40e
+    ### imix-?t?c-ipsec-ip4routing-base-scale-dpdk
     10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -48,13 +48,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-imix-2t1c-ipsec-ip4routing-base-scale-i40e
+imix-2t1c-ipsec-ip4routing-base-scale-dpdk
 ------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -63,8 +63,8 @@ imix-2t1c-ipsec-ip4routing-base-scale-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -74,7 +74,7 @@ imix-2t1c-ipsec-ip4routing-base-scale-i40e
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -83,6 +83,6 @@ imix-2t1c-ipsec-ip4routing-base-scale-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr}
-            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-imix-2t1c-ipsec-ip4routing-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
index 356a11d5ea..fb26e07622 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-x710
-    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    ### 64b-?t?c-l2switching-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -48,13 +48,13 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-avf-i40e
+64b-2t1c-l2switching-base-scale-[avf,dpdk]
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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]{2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
-            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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/2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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]{2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
-            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
+            \label{fig:2n-clx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
index 9675dc165c..4f8c3b3964 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-clx-xxv710.rst
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
@@ -55,7 +55,7 @@
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-dpdk
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
@@ -112,13 +112,13 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-i40e
+64b-2t1c-l2switching-base-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,8 +127,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -138,7 +138,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -147,21 +147,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-i40e
+64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -170,8 +170,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -181,7 +181,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr.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]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
index b53c3d82cf..7115ca9f24 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-x710
-    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    ### 64b-?t?c-l2switching-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -48,13 +48,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-avf-i40e
+64b-2t1c-l2switching-base-scale-[avf,dpdk]
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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]{2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
-            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
+            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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/2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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]{2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
-            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
+            \label{fig:2n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
index b6470d0dac..aae58cce10 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-2n-skx-xxv710.rst
@@ -42,7 +42,7 @@
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
@@ -55,7 +55,7 @@
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.2N1L-25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-dpdk
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
@@ -112,13 +112,13 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-i40e
+64b-2t1c-l2switching-base-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,8 +127,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -138,7 +138,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -147,21 +147,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-i40e
+64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -170,8 +170,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -181,7 +181,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr.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]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
index f4c6b72d16..3963b06c1a 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-dpdk
     10ge2p1xl710-eth-l2patch-ndrpdr
     10ge2p1xl710-dot1q-l2xcbase-ndrpdr
     10ge2p1xl710-eth-l2xcbase-ndrpdr
@@ -48,13 +48,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-l2switching-base-scale-i40e
+64b-1t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,7 +74,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-l2switching-base-scale-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst
index 1028a1a6df..a3bb43bdce 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/l2-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    ### 64b-?t?c-l2switching-base-scale-avf-i40e
+    ### 64b-?t?c-l2switching-base-scale-[avf,dpdk]
     10ge2p1x710-avf-eth-l2patch-ndrpdr - missing
     10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -47,13 +47,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-l2switching-base-scale-avf-i40e
+64b-2t1c-l2switching-base-scale-[avf,dpdk]
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -62,8 +62,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
+            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -73,7 +73,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -82,6 +82,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-avf-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-pdr}
+            \label{fig:3n-skx-x710-64b-2t1c-l2switching-base-scale-[avf,dpdk]-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 5604806740..b4a321ec92 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
@@ -39,7 +39,7 @@
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Xcbase-Ndrpdr.64B-2t1c-avf-eth-l2xcbase-ndrpdr
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Avf-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-avf-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-i40e
+    ### 64b-?t?c-l2switching-base-dpdk
     10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
@@ -50,7 +50,7 @@
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Dot1Q-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-dot1q-l2bdbasemaclrn-ndrpdr
     Tests.Vpp.Perf.L2.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-?t?c-l2switching-base-scale-i40e
+    ### 64b-?t?c-l2switching-base-scale-dpdk
     10ge2p1xxv710-eth-l2patch-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
@@ -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-features-l2switching-base-i40e
+    ###  64b-?t?c-features-l2switching-base-dpdk
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -126,13 +126,13 @@
 
     \clearpage
 
-64b-2t1c-l2switching-base-i40e
+64b-2t1c-l2switching-base-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -141,8 +141,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-l2switching-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -152,7 +152,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,21 +161,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-l2switching-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-l2switching-base-scale-i40e
+64b-2t1c-l2switching-base-scale-dpdk
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-l2switching-base-scale-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-l2switching-base-scale-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -184,8 +184,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-l2switching-base-scale-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -195,7 +195,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-l2switching-base-scale-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-l2switching-base-scale-dpdk-pdr.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-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-l2switching-base-scale-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-features-l2switching-base-i40e
+64b-2t1c-features-l2switching-base-dpdk
 ---------------------------------------
 
 .. raw:: html
 
     <center>
-    <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>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk-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-features-l2switching-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk-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-features-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-dpdk-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-features-l2switching-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-features-l2switching-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst
index 7931b7cfde..ef77b7e8e6 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    ### 78b-?t?c-srv6-ip6routing-base-dpdk
     10ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -48,13 +48,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-1t1c-srv6-ip6routing-base-i40e
+78b-1t1c-srv6-ip6routing-base-dpdk
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr}
-            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-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-hsw-xl710-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-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-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
-            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-78b-1t1c-srv6-ip6routing-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
index 7c5973995e..8c8be1ca2b 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/srv6-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 78b-?t?c-srv6-ip6routing-base-i40e
+    ### 78b-?t?c-srv6-ip6routing-base-dpdk
     10ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -48,13 +48,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-2t1c-srv6-ip6routing-base-i40e
+78b-2t1c-srv6-ip6routing-base-dpdk
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-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-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-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-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-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-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-78b-2t1c-srv6-ip6routing-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
index 29453f4edb..8a535ea660 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-vhost-base-i40e-testpmd
+64b-2t1c-vhost-base-dpdk-testpmd
 --------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-pdr.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]{2n-clx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-vhost-base-i40e-vpp
+64b-2t1c-vhost-base-dpdk-vpp
 ----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
-            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
+            \label{fig:2n-clx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
index 0b8a9ec1e4..32f235f637 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-vhost-base-i40e-testpmd
+64b-2t1c-vhost-base-dpdk-testpmd
 --------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-pdr.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]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-vhost-base-i40e-vpp
+64b-2t1c-vhost-base-dpdk-vpp
 ----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
-            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
+            \label{fig:2n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
index da76c8684f..4baf5c003d 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     10ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-1t1c-vhost-base-i40e-testpmd
+64b-1t1c-vhost-base-dpdk-testpmd
 --------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-64b-1t1c-vhost-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-64b-1t1c-vhost-base-dpdk-pdr.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-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-1t1c-vhost-base-i40e-vpp
+64b-1t1c-vhost-base-dpdk-vpp
 ----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-ndr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-pdr}
-            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr}
+            \label{fig:3n-hsw-xl710-64b-1t1c-vhost-base-dpdk-vpp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
index 9bba507b00..45912dd465 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-dpdk
     10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -51,13 +51,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-2t1c-link-bonding-vhost-base-i40e-testpmd
+64b-2t1c-link-bonding-vhost-base-dpdk-testpmd
 ---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-ndr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -77,7 +77,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-pdr.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-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-pdr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-link-bonding-vhost-base-i40e-vpp
+64b-2t1c-link-bonding-vhost-base-dpdk-vpp
 -----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-ndr}
-            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -120,7 +120,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -129,6 +129,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-pdr}
-            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr}
+            \label{fig:3n-skx-x710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst
index b317992c21..240590eace 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vm_vhost-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,7 +49,7 @@
     Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
     Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-dpdk
     10ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -74,13 +74,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-2t1c-vhost-base-i40e-testpmd
+64b-2t1c-vhost-base-dpdk-testpmd
 --------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-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-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-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-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-vhost-base-i40e-vpp
+64b-2t1c-vhost-base-dpdk-vpp
 ----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-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-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-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-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-vhost-base-dpdk-vpp-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-link-bonding-vhost-base-i40e-testpmd
+64b-2t1c-link-bonding-vhost-base-dpdk-testpmd
 ---------------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-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-link-bonding-vhost-base-dpdk-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-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,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-link-bonding-vhost-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-link-bonding-vhost-base-dpdk-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,21 +195,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-link-bonding-vhost-base-i40e-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-pdr}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-2t1c-link-bonding-vhost-base-i40e-vpp
+64b-2t1c-link-bonding-vhost-base-dpdk-vpp
 -----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-ndr.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -218,8 +218,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-link-bonding-vhost-base-i40e-vpp-ndr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-ndr}
     \end{figure}
 
 .. raw:: latex
@@ -229,7 +229,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-link-bonding-vhost-base-i40e-vpp-pdr.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr.html"></iframe>
     <p><br></p>
     </center>
 
@@ -238,6 +238,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-link-bonding-vhost-base-i40e-vpp-pdr}
-            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-i40e-vpp-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr}
+            \label{fig:3n-skx-xxv710-64b-2t1c-link-bonding-vhost-base-dpdk-vpp-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
index 0d39e01418..26bf6d7962 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-?t?c-vts-l2switching-base-i40e
+    ### 64b-?t?c-vts-l2switching-base-dpdk
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -42,13 +42,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-114b-2t1c-vts-l2switching-base-i40e
+114b-2t1c-vts-l2switching-base-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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]{2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr}
-            \label{fig:2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr}
+            \label{fig:2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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]{2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr}
-            \label{fig:2n-clx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr}
+            \label{fig:2n-clx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-skx-xxv710.rst
index cc4dc865c2..893dac0ec1 100644
--- a/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/packet_throughput_graphs/vts-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-?t?c-vts-l2switching-base-i40e
+    ### 64b-?t?c-vts-l2switching-base-dpdk
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -42,13 +42,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-114b-2t1c-vts-l2switching-base-i40e
+114b-2t1c-vts-l2switching-base-dpdk
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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]{2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr}
-            \label{fig:2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-ndr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-ndr}
+            \label{fig:2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-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]{2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr}
-            \label{fig:2n-skx-xxv710-114b-2t1c-vts-l2switching-base-i40e-pdr}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr}
+            \label{fig:2n-skx-xxv710-114b-2t1c-vts-l2switching-base-dpdk-pdr}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-cx556a.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-cx556a.rst
index 3c169c7322..8857c82c6c 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-cx556a.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-cx556a.rst
@@ -31,7 +31,7 @@
 2n-clx-cx556a
 ~~~~~~~~~~~~~
 
-64b-2t1c-memif-base-i40e
+64b-2t1c-memif-base-dpdk
 ------------------------
 
 .. raw:: html
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
index 3a11c1554a..709f6ef68b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-memif-base-i40e
+    ### 64b-memif-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -39,13 +39,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-64b-memif-base-i40e
+64b-memif-base-dpdk
 -------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-memif-base-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-memif-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-memif-base-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-memif-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -65,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-memif-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-memif-base-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-memif-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-memif-base-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-memif-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
index 5389869916..2faafbe847 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-memif-base-i40e
+    ### 64b-memif-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -39,13 +39,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-memif-base-i40e
+64b-memif-base-dpdk
 -------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -54,8 +54,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-memif-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -65,7 +65,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-memif-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -74,6 +74,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-memif-base-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-memif-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
index 7d7e8b6248..607af138f2 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/container_memif-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 64b-memif-base-i40e
+    ### 64b-memif-base-dpdk
     10ge2p1xxv710-eth-l2xcbase-eth-2memif-1lxc-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2memif-1dcr-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2memif-1dcr-ndrpdr
@@ -40,13 +40,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-memif-base-i40e
+64b-memif-base-dpdk
 -------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-memif-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-memif-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-memif-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-memif-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-memif-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-memif-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-memif-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
index c717ed2c44..74c08b57db 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-x710
-    ###  64b-ip4routing-base-scale-avf-i40e
+    ###  64b-ip4routing-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -40,13 +40,13 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-avf-i40e
+64b-ip4routing-base-scale-[avf,dpdk]
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
-            \label{fig:2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa}
+            \label{fig:2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
-            \label{fig:2n-clx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:2n-clx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
index 49987f2e94..4026ceb55f 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-clx-xxv710.rst
@@ -37,14 +37,14 @@
     2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
     2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-ip4routing-base-scale-i40e
+    ### 64b-ip4routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-features-ip4routing-base-i40e
+    ### 64b-features-ip4routing-base-dpdk
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -98,13 +98,13 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-i40e
+64b-ip4routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -113,8 +113,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -124,7 +124,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -133,21 +133,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features-ip4routing-base-i40e
+64b-features-ip4routing-base-dpdk
 ---------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -156,8 +156,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -167,7 +167,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -176,6 +176,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
index 27ed221b14..8ea7616321 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-x710
-    ###  64b-ip4routing-base-scale-avf-i40e
+    ###  64b-ip4routing-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     2n1l-10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -40,13 +40,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-avf-i40e
+64b-ip4routing-base-scale-[avf,dpdk]
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
-            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa}
+            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
-            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:2n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
index b987eb1428..2ce5ba6c17 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-2n-skx-xxv710.rst
@@ -37,14 +37,14 @@
     2n1l-10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
     2n1l-10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-ip4routing-base-scale-i40e
+    ### 64b-ip4routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
     2n1l-10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-features-ip4routing-base-i40e
+    ### 64b-features-ip4routing-base-dpdk
     2n1l-10ge2p1xxv710-ethip4-ip4base-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     2n1l-10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -98,13 +98,13 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-i40e
+64b-ip4routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -113,8 +113,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -124,7 +124,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -133,21 +133,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features-ip4routing-base-i40e
+64b-features-ip4routing-base-dpdk
 ---------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -156,8 +156,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -167,7 +167,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -176,6 +176,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
index 3bf871313c..8f69e2c765 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-ip4routing-base-scale-i40e
+    ### 64b-ip4routing-base-scale-dpdk
     10ge2p1xl710-dot1q-ip4base-ndrpdr
     10ge2p1xl710-ethip4-ip4base-ndrpdr
     10ge2p1xl710-ethip4-ip4scale2m-ndrpdr
@@ -38,13 +38,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-ip4routing-base-scale-i40e
+64b-ip4routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -53,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -64,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -73,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst
index 29f9dd944a..b1bbe2a60b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    ### 64b-ip4routing-base-scale-avf-i40e
+    ### 64b-ip4routing-base-scale-[avf,dpdk]
     10ge2p1x710-avf-ethip4-ip4base-ndrpdr
     10ge2p1x710-avf-ethip4-ip4scale2m-ndrpdr
     10ge2p1x710-dot1q-ip4base-ndrpdr
@@ -40,13 +40,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-ip4routing-base-scale-avf-i40e
+64b-ip4routing-base-scale-[avf,dpdk]
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-ip4routing-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
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 418d41457a..d1aaae88c6 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
@@ -36,14 +36,14 @@
     10ge2p1xxv710-avf-ethip4-ip4scale200k-ndrpdr
     10ge2p1xxv710-avf-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-ip4routing-base-scale-i40e
+    ### 64b-ip4routing-base-scale-dpdk
     10ge2p1xxv710-dot1q-ip4base-ndrpdr
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale20k-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale200k-ndrpdr
     10ge2p1xxv710-ethip4-ip4scale2m-ndrpdr
 
-    ### 64b-features-ip4routing-base-i40e
+    ### 64b-features-ip4routing-base-dpdk
     10ge2p1xxv710-ethip4-ip4base-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-ethip4udp-ip4base-iacl50sl-10kflows-ndrpdr
@@ -97,13 +97,13 @@
 
     \clearpage
 
-64b-ip4routing-base-scale-i40e
+64b-ip4routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -112,8 +112,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -123,7 +123,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -132,21 +132,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features-ip4routing-base-i40e
+64b-features-ip4routing-base-dpdk
 ---------------------------------
 
 .. raw:: html
 
     <center>
-    <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>
+    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-ip4routing-base-dpdk-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-features-ip4routing-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-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-features-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-dpdk-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-features-ip4routing-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-ip4routing-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
index cbd855d16b..9c0bf0fe74 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-hsw-xl710.rst
@@ -30,20 +30,20 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-ip4tunnel-base-i40e
+    ### 64b-ip4tunnel-base-dpdk
     10ge2p1xl710-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1xl710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
 
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-ip4tunnel-base-i40e
+64b-ip4tunnel-base-dpdk
 -----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -63,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-ip4tunnel-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-ip4tunnel-base-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-ip4tunnel-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
index e40d9e0b37..b8d6e6220b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip4_tunnels-3n-skx-xxv710.rst
@@ -29,7 +29,7 @@
     </script>
 ..
     ## 3n-skx-xxv710
-    ### 64b-ip4tunnel-base-scale-i40e
+    ### 64b-ip4tunnel-base-scale-dpdk
     10ge2p1xxv710-ethip4vxlan-l2xcbase-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-dot1q--ethip4vxlan-l2bdscale1l2bd1vlan1vxlan-ndrpdr
@@ -38,13 +38,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-ip4tunnel-base-scale-i40e
+64b-ip4tunnel-base-scale-dpdk
 -----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -53,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -64,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -73,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-ip4tunnel-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
index db7214eb1b..b5cae9adf7 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-x710.rst
@@ -30,20 +30,20 @@
 
 ..
     ## 2n-clx-x710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
 2n-clx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-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/2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -63,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-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/2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-clx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
index 9254f5ab14..aca728fc0a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -40,13 +40,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
index 841368092f..c63b5b9598 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-x710.rst
@@ -30,20 +30,20 @@
 
 ..
     ## 2n-skx-x710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     2n1l-10ge2p1x710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
 2n-skx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-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/2n-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -63,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-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/2n-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
index 5d29026454..f6eda2f742 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     2n1l-10ge2p1xxv710-dot1q-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6base-ndrpdr
     2n1l-10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -40,13 +40,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
index 5039dce364..b05a6ac0e6 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     10ge2p1xl710-dot1q-ip6base-ndrpdr
     10ge2p1xl710-ethip6-ip6base-ndrpdr
     10ge2p1xl710-ethip6-ip6scale2m-ndrpdr
@@ -38,13 +38,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst
index 229e08f565..ec51ec499b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-x710.rst
@@ -30,20 +30,20 @@
 
 ..
     ## 3n-skx-x710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     10ge2p1x710-ethip6-ip6base-ndrpdr
     10ge2p1x710-ethip6-ip6scale2m-ndrpdr
 
 3n-skx-x710
 ~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-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-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -52,8 +52,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -63,7 +63,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-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-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -72,6 +72,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-x710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst
index ad83b7b60e..2efd9887ca 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ip6-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 78b-ip6routing-base-scale-i40e
+    ### 78b-ip6routing-base-scale-dpdk
     10ge2p1xxv710-dot1q-ip6base-ndrpdr
     10ge2p1xxv710-ethip6-ip6base-ndrpdr
     10ge2p1xxv710-ethip6-ip6scale20k-ndrpdr
@@ -40,13 +40,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-ip6routing-base-scale-i40e
+78b-ip6routing-base-scale-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -55,8 +55,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -66,7 +66,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -75,6 +75,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-78b-ip6routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
index 6b93534ca9..fb68dc8f0d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### imix-ipsec-ip4routing-base-scale-sw-i40e
+    ### imix-ipsec-ip4routing-base-scale-sw-dpdk
     10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xl710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -38,7 +38,7 @@
     10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec10000tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
 
-    ### imix-ipsec-ip4routing-base-scale-hw-i40e
+    ### imix-ipsec-ip4routing-base-scale-hw-dpdk
     10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xl710-ethip4ipsec1tnlhw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xl710-ethip4ipsec1000tnlhw-ip4base-int-aes256gcm-ndrpdr
@@ -47,13 +47,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-imix-ipsec-ip4routing-base-scale-sw-i40e
+imix-ipsec-ip4routing-base-scale-sw-dpdk
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -62,8 +62,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-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -73,7 +73,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-hsw-xl710-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-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -82,21 +82,21 @@ 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-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-sw-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-imix-ipsec-ip4routing-base-scale-hw-i40e
+imix-ipsec-ip4routing-base-scale-hw-dpdk
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -105,8 +105,8 @@ imix-ipsec-ip4routing-base-scale-hw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -116,7 +116,7 @@ imix-ipsec-ip4routing-base-scale-hw-i40e
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -125,6 +125,6 @@ imix-ipsec-ip4routing-base-scale-hw-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-imix-ipsec-ip4routing-base-scale-hw-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
index 1aa38afe61..6ff4694c62 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/ipsec-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### imix-ipsec-ip4routing-base-scale-i40e
+    ### imix-ipsec-ip4routing-base-scale-dpdk
     10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes256gcm-ndrpdr
     10ge2p1xxv710-ethip4ipsec4tnlsw-ip4base-int-aes128cbc-hmac512sha-ndrpdr
     10ge2p1xxv710-ethip4ipsec1000tnlsw-ip4base-int-aes256gcm-ndrpdr
@@ -41,13 +41,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-imix-ipsec-ip4routing-base-scale-i40e
+imix-ipsec-ip4routing-base-scale-dpdk
 -------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@ imix-ipsec-ip4routing-base-scale-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@ imix-ipsec-ip4routing-base-scale-i40e
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@ imix-ipsec-ip4routing-base-scale-i40e
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-imix-ipsec-ip4routing-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
index bceda69e91..ea9278e495 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-x710
-    ### 64b-l2switching-base-scale-avf-i40e
+    ### 64b-l2switching-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -41,13 +41,13 @@
 2n-clx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-avf-i40e
+64b-l2switching-base-scale-[avf,dpdk]
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
+            \label{fig:2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
-            \label{fig:2n-clx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:2n-clx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
index 95019ef8b1..537f319e3e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-clx-xxv710.rst
@@ -37,14 +37,14 @@
     2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 
-    ### 64b-l2switching-base-i40e
+    ### 64b-l2switching-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-l2switching-base-scale-i40e
+    ### 64b-l2switching-base-scale-dpdk
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
@@ -96,13 +96,13 @@
 
     \clearpage
 
-64b-l2switching-base-i40e
+64b-l2switching-base-dpdk
 -------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,8 +111,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -122,7 +122,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-l2switching-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -131,21 +131,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-l2switching-base-scale-i40e
+64b-l2switching-base-scale-dpdk
 -------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -154,8 +154,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -165,7 +165,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -174,6 +174,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
index a2af1d4beb..6f9956521e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-x710
-    ### 64b-l2switching-base-scale-avf-i40e
+    ### 64b-l2switching-base-scale-[avf,dpdk]
     2n1l-10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1x710-avf-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -41,13 +41,13 @@
 2n-skx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-avf-i40e
+64b-l2switching-base-scale-[avf,dpdk]
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
-            \label{fig:2n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
+            \label{fig:2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
-            \label{fig:2n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:2n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
index a5f948e329..d19a63399a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-2n-skx-xxv710.rst
@@ -37,14 +37,14 @@
     2n1l-10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-avf-dot1q-l2bdbasemaclrn-gbp-ndrpdr
 
-    ### 64b-l2switching-base-i40e
+    ### 64b-l2switching-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2patch-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2xcbase-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-l2switching-base-scale-i40e
+    ### 64b-l2switching-base-scale-dpdk
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale10kmaclrn-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
@@ -96,13 +96,13 @@
 
     \clearpage
 
-64b-l2switching-base-i40e
+64b-l2switching-base-dpdk
 -------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -111,8 +111,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -122,7 +122,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -131,21 +131,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-l2switching-base-scale-i40e
+64b-l2switching-base-scale-dpdk
 -------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -154,8 +154,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -165,7 +165,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -174,6 +174,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
index 8017f74d79..5dc6a12cd0 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-l2switching-base-scale-i40e
+    ### 64b-l2switching-base-scale-dpdk
     10ge2p1xl710-eth-l2patch-ndrpdr
     10ge2p1xl710-dot1q-l2xcbase-ndrpdr
     10ge2p1xl710-eth-l2xcbase-ndrpdr
@@ -41,13 +41,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-l2switching-base-scale-i40e
+64b-l2switching-base-scale-dpdk
 -------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-l2switching-base-scale-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst
index 29176a0e81..49da85579a 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/l2-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    ### 64b-l2switching-base-scale-avf-i40e
+    ### 64b-l2switching-base-scale-[avf,dpdk]
     10ge2p1x710-avf-eth-l2patch-ndrpdr
     10ge2p1x710-avf-eth-l2xcbase-ndrpdr
     10ge2p1x710-avf-eth-l2bdbasemaclrn-ndrpdr
@@ -41,13 +41,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-l2switching-base-scale-avf-i40e
+64b-l2switching-base-scale-[avf,dpdk]
 -----------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
-            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
+            \label{fig:3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-l2switching-base-scale-avf-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-pdr-tsa}
+            \label{fig:3n-skx-x710-64b-l2switching-base-scale-[avf,dpdk]-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 16556249ac..a730d2f9ac 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
@@ -35,13 +35,13 @@
     10ge2p1xxv710-avf-eth-l2xcbase-ndrpdr
     10ge2p1xxv710-avf-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-l2switching-base-i40e
+    ### 64b-l2switching-base-dpdk
     10ge2p1xxv710-dot1q-l2xcbase-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
 
-    ### 64b-l2switching-base-scale-i40e
+    ### 64b-l2switching-base-scale-dpdk
     10ge2p1xxv710-eth-l2patch-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
@@ -49,7 +49,7 @@
     10ge2p1xxv710-eth-l2bdscale100kmaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdscale1mmaclrn-ndrpdr
 
-    ###  64b-features-l2switching-base-i40e
+    ###  64b-features-l2switching-base-dpdk
     10ge2p1xxv710-eth-l2bdbasemaclrn-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sf-10kflows-ndrpdr
     10ge2p1xxv710-eth-l2bdbasemaclrn-iacl50sl-10kflows-ndrpdr
@@ -103,13 +103,13 @@
 
     \clearpage
 
-64b-l2switching-base-i40e
+64b-l2switching-base-dpdk
 -------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-l2switching-base-dpdk-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-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -129,7 +129,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -138,21 +138,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-l2switching-base-scale-i40e
+64b-l2switching-base-scale-dpdk
 -------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -161,8 +161,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -172,7 +172,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa.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-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-l2switching-base-scale-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-features-l2switching-base-i40e
+64b-features-l2switching-base-dpdk
 ----------------------------------
 
 .. raw:: html
 
     <center>
-    <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>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-features-l2switching-base-dpdk-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-features-l2switching-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-dpdk-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-features-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-dpdk-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-features-l2switching-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-features-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-features-l2switching-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst
index ea8eaf698f..20f097fc14 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 78b-srv6-ip6routing-base-i40e
+    ### 78b-srv6-ip6routing-base-dpdk
     10ge2p1xl710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1xl710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -41,13 +41,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-78b-srv6-ip6routing-base-i40e
+78b-srv6-ip6routing-base-dpdk
 -----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-srv6-ip6routing-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-78b-srv6-ip6routing-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-78b-srv6-ip6routing-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
index 7ed389c2c9..66e4a70a36 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/srv6-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 78b-srv6-ip6routing-base-i40e
+    ### 78b-srv6-ip6routing-base-dpdk
     10ge2p1xxv710-ethip6ip6-ip6base-srv6enc1sid-ndrpdr
     10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-ndrpdr
     10ge2p1xxv710-ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
@@ -41,13 +41,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-78b-srv6-ip6routing-base-i40e
+78b-srv6-ip6routing-base-dpdk
 -----------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-78b-srv6-ip6routing-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -56,8 +56,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-srv6-ip6routing-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -67,7 +67,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-78b-srv6-ip6routing-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -76,6 +76,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-78b-srv6-ip6routing-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-78b-srv6-ip6routing-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
index 5fc7752772..27b5c0e543 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-64b-vhost-base-i40e-testpmd
+64b-vhost-base-dpdk-testpmd
 ---------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-dpdk-pdr-tsa.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]{2n-clx-xxv710-64b-vhost-base-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-vhost-base-i40e-vpp
+64b-vhost-base-dpdk-vpp
 -----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:2n-clx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:2n-clx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:2n-clx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
index f602a520fc..3f73c3e93b 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     2n1l-10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     2n1l-10ge2p1xxv710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-vhost-base-i40e-testpmd
+64b-vhost-base-dpdk-testpmd
 ---------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-dpdk-pdr-tsa.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]{2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-vhost-base-i40e-vpp
+64b-vhost-base-dpdk-vpp
 -----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:2n-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:2n-skx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
index 53ebf64bfa..c251efc987 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-hsw-xl710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-hsw-xl710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     10ge2p1xl710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xl710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xl710-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,13 +49,13 @@
 3n-hsw-xl710
 ~~~~~~~~~~~~
 
-64b-vhost-base-i40e-testpmd
+64b-vhost-base-dpdk-testpmd
 ---------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-64b-vhost-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -64,8 +64,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-dpdk-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -75,7 +75,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-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-hsw-xl710-64b-vhost-base-dpdk-pdr-tsa.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-hsw-xl710-64b-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-dpdk-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-vhost-base-i40e-vpp
+64b-vhost-base-dpdk-vpp
 -----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-dpdk-vpp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -107,8 +107,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -118,7 +118,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-hsw-xl710-64b-vhost-base-dpdk-vpp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -127,6 +127,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:3n-hsw-xl710-64b-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-hsw-xl710-64b-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:3n-hsw-xl710-64b-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
index 284e3c3c85..2bd17e050e 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-x710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-x710
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-dpdk
     10ge2p1x710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1x710-2lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -51,13 +51,13 @@
 3n-skx-x710
 ~~~~~~~~~~~
 
-64b-link-bonding-vhost-base-i40e-testpmd
+64b-link-bonding-vhost-base-dpdk-testpmd
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa.html"></iframe>
+    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -66,8 +66,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -77,7 +77,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa.html"></iframe>
+    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-dpdk-pdr-tsa.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-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-link-bonding-vhost-base-i40e-vpp
+64b-link-bonding-vhost-base-dpdk-vpp
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -109,8 +109,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -120,7 +120,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -129,6 +129,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:3n-skx-x710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst
index 3d335f9452..7b17ecebb7 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vm_vhost-3n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 3n-skx-xxv710
-    ### 64b-?t?c-vhost-base-i40e
+    ### 64b-?t?c-vhost-base-dpdk
     10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-dot1q-l2bdbasemaclrn-eth-2vhostvr1024-1vm-ndrpdr
@@ -49,7 +49,7 @@
     Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Eth-L2Bdbasemaclrn-Eth-2Vhostvr1024-1Vm-Vppl2Xc-Ndrpdr.64B-2t1c-eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc-ndrpdr
     Tests.Vpp.Perf.Vm Vhost.25Ge2P1Xxv710-Ethip4-Ip4Base-Eth-2Vhostvr1024-1Vm-Vppip4-Ndrpdr.64B-2t1c-ethip4-ip4base-eth-2vhostvr1024-1vm-vppip4-ndrpdr
 
-    #### 64b-?t?c-link-bonding-vhost-base-i40e
+    #### 64b-?t?c-link-bonding-vhost-base-dpdk
     10ge2p1xxv710-1lbvpplacp-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-dot1q-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-eth-l2xcbase-eth-2vhostvr1024-1vm-ndrpdr
@@ -74,13 +74,13 @@
 3n-skx-xxv710
 ~~~~~~~~~~~~~
 
-64b-vhost-base-i40e-testpmd
+64b-vhost-base-dpdk-testpmd
 ---------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-vhost-base-dpdk-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-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -100,7 +100,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-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-skx-xxv710-64b-vhost-base-dpdk-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-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-vhost-base-i40e-vpp
+64b-vhost-base-dpdk-vpp
 -----------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="11" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-vhost-base-dpdk-vpp-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-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -143,7 +143,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="12" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-vhost-base-dpdk-vpp-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-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-link-bonding-vhost-base-i40e-testpmd
+64b-link-bonding-vhost-base-dpdk-testpmd
 ----------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="21" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-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-link-bonding-vhost-base-dpdk-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-skx-xxv710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -186,7 +186,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="22" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-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-link-bonding-vhost-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -195,21 +195,21 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-pdr-tsa}
     \end{figure}
 
 .. raw:: latex
 
     \clearpage
 
-64b-link-bonding-vhost-base-i40e-vpp
+64b-link-bonding-vhost-base-dpdk-vpp
 ------------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa.html"></iframe>
+    <iframe id="31" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -218,8 +218,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa}
-            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -229,7 +229,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa.html"></iframe>
+    <iframe id="32" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -238,6 +238,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa}
-            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-i40e-vpp-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa}
+            \label{fig:3n-skx-xxv710-64b-link-bonding-vhost-base-dpdk-vpp-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
index d33137f106..cb47eca3cb 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-clx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-clx-xxv710
-    ### 64b-vts-l2switching-base-i40e
+    ### 64b-vts-l2switching-base-dpdk
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -38,13 +38,13 @@
 2n-clx-xxv710
 ~~~~~~~~~~~~~
 
-114b-vts-l2switching-base-i40e
+114b-vts-l2switching-base-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -53,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
-            \label{fig:2n-clx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:2n-clx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -64,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-clx-xxv710-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/2n-clx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -73,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
-            \label{fig:2n-clx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-clx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:2n-clx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa}
     \end{figure}
diff --git a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-skx-xxv710.rst b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-skx-xxv710.rst
index fd373b791e..e288a04d6d 100644
--- a/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-skx-xxv710.rst
+++ b/docs/report/vpp_performance_tests/throughput_speedup_multi_core/vts-2n-skx-xxv710.rst
@@ -30,7 +30,7 @@
 
 ..
     ## 2n-skx-xxv710
-    ### 64b-vts-l2switching-base-i40e
+    ### 64b-vts-l2switching-base-dpdk
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-noacl-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermit-2vhostvr1024-1vm-ndrpdr
     10ge2p1xxv710-ethip4vxlan-l2bdbasemaclrn-eth-iacldstbase-aclpermitreflect-2vhostvr1024-1vm-ndrpdr
@@ -38,13 +38,13 @@
 2n-skx-xxv710
 ~~~~~~~~~~~~~
 
-114b-vts-l2switching-base-i40e
+114b-vts-l2switching-base-dpdk
 ------------------------------
 
 .. raw:: html
 
     <center>
-    <iframe id="01" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -53,8 +53,8 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
-            \label{fig:2n-skx-xxv710-114b-vts-l2switching-base-i40e-ndr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa}
+            \label{fig:2n-skx-xxv710-114b-vts-l2switching-base-dpdk-ndr-tsa}
     \end{figure}
 
 .. raw:: latex
@@ -64,7 +64,7 @@
 .. raw:: html
 
     <center>
-    <iframe id="02" onload="setIframeHeight(this.id)" width="700" frameborder="0" scrolling="no" src="../../_static/vpp/2n-skx-xxv710-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/2n-skx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa.html"></iframe>
     <p><br></p>
     </center>
 
@@ -73,6 +73,6 @@
     \begin{figure}[H]
         \centering
             \graphicspath{{../_build/_static/vpp/}}
-            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
-            \label{fig:2n-skx-xxv710-114b-vts-l2switching-base-i40e-pdr-tsa}
+            \includegraphics[clip, trim=0cm 0cm 5cm 0cm, width=0.70\textwidth]{2n-skx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa}
+            \label{fig:2n-skx-xxv710-114b-vts-l2switching-base-dpdk-pdr-tsa}
     \end{figure}