CSIT-1436: Add titles to plots in Trending

CSIT-1435: Remove index from Trending

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

121 files changed, 1794 insertions, 3780 deletions

diff --git a/docs/cpta/index.rst b/docs/cpta/index.rst
index 3b037f6f29..4f05500647 100644
--- a/docs/cpta/index.rst
+++ b/docs/cpta/index.rst
@@ -43,9 +43,3 @@ analysis and anomaly detection methodology.
     :caption: Performance Data
 
     Download <data/index>
-
-.. toctree::
-    :maxdepth: 2
-    :caption: Indices and tables
-
-    Index <indices>
diff --git a/docs/cpta/indices.rst b/docs/cpta/indices.rst
deleted file mode 100644
index 6dd08416cb..0000000000
--- a/docs/cpta/indices.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Indices and tables
-==================
-
-* :ref:`genindex`
diff --git a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst b/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
index f5d72805ce..8e74ded94c 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst b/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
index bcc97f5927..3d1bc9469e 100644
--- a/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
index 9fe6522e8e..e458ff1fe4 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
index 87f1968c3e..2c3cc7ca2b 100644
--- a/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-2n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
index 24886b15e9..d6e88cf59f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x520-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
index 3de1138fa8..8db458a0ea 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x520-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
index 917f43cb5b..41c401db3f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
index abe9931605..8158761e4c 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst b/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
index 1e03be57d3..fe371d783f 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-xl710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst b/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
index 5c0c4308d6..83da76b75b 100644
--- a/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-hsw-xl710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-memif-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst b/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
index 2f8cf792e8..363eab81e1 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst b/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
index 4a9aff33e2..686518c28e 100644
--- a/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
index 1231970da3..53b7def558 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-l2-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
index db18434ac1..f8fb36dc6d 100644
--- a/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/container_memif-3n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-memif-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-container-memif-imix-l2-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
index bedc06a7b9..76f4f878fa 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
index 975fb87b08..f5277dba3d 100644
--- a/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst b/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
index 018d15c8ca..f1986c7993 100644
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-xxv710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst b/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
index 5bce500813..ab78e78a79 100644
--- a/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
+++ b/docs/cpta/trending/dpdk-2n-skx-xxv710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
index a9942caed9..b3298a77e9 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x520-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
index 8a6eb92eb8..72b2c49ddc 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
index 3c8e64393f..5b98cef906 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
index d5831caf26..5928ee6f2c 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst b/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
index 78cd14e7ee..7230885fd2 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-xl710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst b/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
index d0e51d8f07..468aafb653 100644
--- a/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-hsw-xl710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-dpdk-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst b/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
index 7e45e0e14c..62dd79dacc 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst b/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
index b530fde959..06950b87b2 100644
--- a/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst b/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
index ea3464a939..8498b88785 100644
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-xxv710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-64b-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst b/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
index 836ddef06a..a34527738d 100644
--- a/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
+++ b/docs/cpta/trending/dpdk-3n-skx-xxv710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-dpdk-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="http://fast.dpdk.org/rel/" target="_blank">dpdk-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-dpdk-perf-mrr-weekly-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-dpdk-imix-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
index 06300de7a8..25cdee6683 100644
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-2n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst b/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
index fa43271173..30b131aadc 100644
--- a/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-2n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
index e0cc09d162..2421c2301d 100644
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
index 3b8efaba96..4a91698ebf 100644
--- a/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/ip4-2n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
index 5a302eb632..6473d31ca6 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
index 51b45bf909..3d186517a5 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-iacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-iacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
index a2b557a574..922bb66afe 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features-oacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-oacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
index 28c87e3e92..52f5d72954 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x520-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
index df4e831e73..2da3585d16 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst b/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
index a79685c9ab..7503d9ae29 100644
--- a/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst b/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst
index bc07b77c6c..81dc338e87 100644
--- a/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst
+++ b/docs/cpta/trending/ip4-3n-hsw-xl710-64b-base-scale-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale-features"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-64b-base-scale-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
index c30e36685b..5f14d9f66e 100644
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst b/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
index 5d2d7c785f..582f723868 100644
--- a/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
index 80c0f72d0d..86332a469e 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
index 5a1b73a4ab..0665bd329e 100644
--- a/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/ip4-3n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-feature-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
index 09b4d577ab..26574a4646 100644
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
index 741a7ba57c..cd4100368d 100644
--- a/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
index a1c517c61e..9ee9f104ce 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-hsw-x520-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4tun-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
index 5e57348e37..df2feca41b 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4tun-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
index 5e1ae91865..3728a994a9 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
index ce80cf92f0..05b6fe6f0c 100644
--- a/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/ip4_tunnels-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4tun-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip4-tunnels-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
index fceabf0232..a338e6e758 100644
--- a/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-2n-skx-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst b/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
index 9e7aa5fe9d..df2ddf7304 100644
--- a/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-2n-skx-xxv710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
index e065f2b091..c8c9f7d55a 100644
--- a/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-x520-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
index 980daa65fd..e05ff0a143 100644
--- a/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
index 8156e6d2a2..8edf6cc24f 100644
--- a/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-hsw-xl710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-78b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-78b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-78b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip6-78b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
index 94746d95c0..0b45bcc303 100644
--- a/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-skx-x710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst b/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
index e0936d3a48..069400ac0b 100644
--- a/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
+++ b/docs/cpta/trending/ip6-3n-skx-xxv710-78b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-78b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-78b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip6-78b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ip6-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
index 3f595570f6..ebaed4fe57 100644
--- a/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
+++ b/docs/cpta/trending/ipsec-3n-hsw-xl710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-ipsec-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
index e16db7a804..4c292e064f 100644
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst b/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
index 4397b5c87f..f17c888c25 100644
--- a/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-2n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
index a5072a8999..d379052f04 100644
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-2n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst b/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
index 673dbaa652..0195668c1b 100644
--- a/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/l2-2n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
index 87234539ab..61f9a351b9 100644
--- a/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-vic1227-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="vic1227-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-vic1227-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="vic1227-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-vic1227-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="vic1227-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1227-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-vic1227-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
index 3fc443dab6..9bb21d8044 100644
--- a/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-vic1385-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="vic1385-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-vic1385-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="vic1385-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-vic1385-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="vic1385-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-vic1385-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-vic1385-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
index c11192afbe..c20bb322ac 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
index 1dd2088a4c..38102284ad 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-iacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-iacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-iacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-iacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
index ec1322c812..e7499b8aad 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-macip.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-macip.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-macip.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-macip"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-macip-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-macip.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
index e650a2c020..fa2b788779 100644
--- a/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x520-64b-features-oacl.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-features-oacl"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-64b-features-oacl-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x520-3n-hsw-oacl.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
index 3bd15429bd..5254be547d 100644
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst b/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
index a2b3957628..f63a8232cd 100644
--- a/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-hsw-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-features"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-64b-features-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
index bfa3738216..3e7206d07a 100644
--- a/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-hsw-xl710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-64b-base-scale-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
index f860de8112..e25ecae1dc 100644
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-skx-x710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst b/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
index f570b64a5e..818d3ecc03 100644
--- a/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-skx-x710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst b/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
index 23c1506cbc..9e08dcf004 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710-64b-base-scale.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base-scale"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-base-scale-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst b/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
index cd1a711bc4..b16232fce3 100644
--- a/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
+++ b/docs/cpta/trending/l2-3n-skx-xxv710-64b-features.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-features"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-64b-features-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-l2-feature-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst b/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
index c97374b002..80f9852fbb 100644
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-2n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst b/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
index 5947effdb7..7b32e07c95 100644
--- a/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-2n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`2n-skx-x710-lb-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst b/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
index c033712be3..557907600b 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x520-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst b/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
index 4ab33216ab..bf9d64015a 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-lb-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst b/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
index a8fefff28a..8357eb9750 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-64b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst b/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
index 94d3e297a1..53aae58d48 100644
--- a/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-hsw-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-lb-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst b/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
index 563c7ba634..86497aaabd 100644
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
+++ b/docs/cpta/trending/link_bonding-3n-skx-x710-64b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-64b-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-64b-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst b/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
index f660aec2e6..4e2c9eab97 100644
--- a/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
+++ b/docs/cpta/trending/link_bonding-3n-skx-x710-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c"></a>
-    <center><b>
-
-:index:`3n-skx-x710-lb-imix-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-lb-imix-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst b/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
index 2af5c45a7b..475a9206e1 100644
--- a/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
+++ b/docs/cpta/trending/srv6-3n-hsw-x520-78b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-78b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-78b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,19 +21,12 @@
 .. raw:: html
 
     <a name="x520-78b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
-
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-78b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -48,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-78b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-78b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-78b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst b/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
index 143ebddbbb..dddc6b12da 100644
--- a/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
+++ b/docs/cpta/trending/srv6-3n-hsw-x520-imix.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-imix-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-imix-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-srv6-imix-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-srv6-imix-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/srv6.rst b/docs/cpta/trending/srv6.rst
index 06d6f5b11b..b4f3f330e1 100644
--- a/docs/cpta/trending/srv6.rst
+++ b/docs/cpta/trending/srv6.rst
@@ -4,4 +4,6 @@ SRv6 Routing
 .. toctree::
 
     srv6-3n-hsw-x520-78b
+
+..
     srv6-3n-hsw-x520-imix
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst
index 2236d407a4..01c3310f3e 100644
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst
index 236c4510e8..608823493f 100644
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-2n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst
index 939eb77832..c22c4b595d 100644
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst
index 6692c6dce4..4b49d231b7 100644
--- a/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-2n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst
index 81519e8679..a5634afb74 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst
index 9152196a5b..48704fc446 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x520-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-ip4-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst
index eabe1a6c97..4a5e153d07 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst
index e821219bbc..a93a9fab62 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-hsw-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-ip4-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
index 14a268cd8d..538b1452c2 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst
index 1a5f1ea446..56ae647ef5 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst
index 107fe1a2bc..1f48cddf86 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-ethip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst
index 93094fcbd1..2d3d275d1d 100644
--- a/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_ip4-3n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-ip4-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst
index c8511a5d1a..45caa1cb30 100644
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst
index 575a0a8b1d..95b30076bb 100644
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-2n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t1c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t2c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-x710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-8t4c-x710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst
index 2c2eecc4f9..ca85a31bef 100644
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst
index 37d97aadac..f402abf51a 100644
--- a/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-2n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t1c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t2c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`2n-skx-xxv710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-2n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-8t4c-xxv710-2n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
index 23a8f6a89b..a7a1449716 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2bd.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
index 7347b2c7e3..395e16f278 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-64b-base-l2xc.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-64b-1t1c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-64b-2t2c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-64b-4t4c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
index 02d51c4d4b..2e68561410 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2bd.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base-l2bd"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
index 4dc46f1f71..0e42cbba13 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x520-imix-base-l2xc.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-imix-1t1c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x520-imix-2t2c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-imix-4t4c-base-l2xc"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst
index 6cfa55b959..764f1ff828 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst
index 6a278758fe..d94093de45 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-x710-l2sw-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-x710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst
index db36fa396b..1137d624f6 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-64b-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-64b-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-64b-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-64b-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst
index 3822a68573..0f8e37f188 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-hsw-xl710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xl710-imix-1t1c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-1t1c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xl710-imix-2t2c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t2c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xl710-imix-4t4c-base"></a>
-    <center><b>
-
-:index:`3n-hsw-xl710-l2sw-vhost-imix-base-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t4c-xl710-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst
index 1e3c8b0322..84b106cc90 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst
index e4d609162d..a2112cbae5 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-skx-x710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t1c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="x710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t2c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="x710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-x710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-8t4c-x710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst
index 07efdbf8ee..d63ff7be06 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-64b-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-64b-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-64b-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-64b-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-eth-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst
index 30aec7047d..21a7ab5b43 100644
--- a/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst
+++ b/docs/cpta/trending/vm_vhost_l2-3n-skx-xxv710-imix-base.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-2t1c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-2t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-2t1c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t2c
@@ -27,18 +21,12 @@
 .. raw:: html
 
     <a name="xxv710-imix-4t2c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-4t2c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-4t2c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 8t4c
@@ -47,16 +35,10 @@
 .. raw:: html
 
     <a name="xxv710-imix-8t4c-base"></a>
-    <center><b>
-
-:index:`3n-skx-xxv710-l2sw-vhost-imix-base-8t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master-3n-skx" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vm-vhost-imix-eth-8t4c-xxv710-3n-skx.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/docs/cpta/trending/vm_vhost_l2.rst b/docs/cpta/trending/vm_vhost_l2.rst
index 755f809007..9a618cbe40 100644
--- a/docs/cpta/trending/vm_vhost_l2.rst
+++ b/docs/cpta/trending/vm_vhost_l2.rst
@@ -6,14 +6,16 @@ L2 VMs vhost-user
     vm_vhost_l2-3n-hsw-x520-64b-base-l2xc
     vm_vhost_l2-3n-hsw-x520-64b-base-l2bd
     vm_vhost_l2-3n-hsw-x710-64b-base
-    vm_vhost_l2-3n-hsw-xl710-64b-base
     vm_vhost_l2-3n-hsw-x520-imix-base-l2xc
     vm_vhost_l2-3n-hsw-x520-imix-base-l2bd
     vm_vhost_l2-3n-hsw-x710-imix-base
-    vm_vhost_l2-3n-hsw-xl710-imix-base
     vm_vhost_l2-3n-skx-x710-64b-base
     vm_vhost_l2-3n-skx-x710-imix-base
     vm_vhost_l2-2n-skx-x710-64b-base
     vm_vhost_l2-2n-skx-x710-imix-base
     vm_vhost_l2-2n-skx-xxv710-64b-base
     vm_vhost_l2-2n-skx-xxv710-imix-base
+
+..
+    vm_vhost_l2-3n-hsw-xl710-64b-base
+    vm_vhost_l2-3n-hsw-xl710-imix-base
diff --git a/docs/cpta/trending/vts-3n-hsw-x520-114b.rst b/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
index 7143cf86a0..0b59e92299 100644
--- a/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
+++ b/docs/cpta/trending/vts-3n-hsw-x520-114b.rst
@@ -7,18 +7,12 @@
 .. raw:: html
 
     <a name="x520-114b-1t1c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-1t1c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vts-114b-1t1c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 2t2c
@@ -27,19 +21,12 @@
 .. raw:: html
 
     <a name="x520-114b-2t2c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-2t2c-mrr`
-
-.. raw:: html
-
-    </b>
-
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vts-114b-2t2c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
 
 4t4c
@@ -48,16 +35,10 @@
 .. raw:: html
 
     <a name="x520-114b-4t4c"></a>
-    <center><b>
-
-:index:`3n-hsw-x520-vts-114b-4t4c-mrr`
-
-.. raw:: html
-
-    </b>
+    <center>
     Links to builds:
     <a href="https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/vpp/" target="_blank">vpp-ref</a>,
     <a href="https://jenkins.fd.io/view/csit/job/csit-vpp-perf-mrr-daily-master" target="_blank">csit-ref</a>
     <iframe width="1100" height="800" frameborder="0" scrolling="no" src="../_static/vpp/cpta-vts-114b-4t4c-x520-3n-hsw.html"></iframe>
-    <p><br><br></p>
+    <p><br></p>
     </center>
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py
index 5d088ca94e..b42b639fe4 100644
--- a/resources/tools/presentation/generator_CPTA.py
+++ b/resources/tools/presentation/generator_CPTA.py
@@ -399,8 +399,8 @@ def _generate_all_charts(spec, input_data):
 
         if traces:
             # Generate the chart:
-            graph["layout"]["xaxis"]["title"] = \
-                graph["layout"]["xaxis"]["title"].format(job=job_name)
+            graph["layout"]["title"] = \
+                "<b>{title}</b>".format(title=graph.get("title", ""))
             name_file = "{0}-{1}{2}".format(spec.cpta["output-file"],
                                             graph["output-file-name"],
                                             spec.cpta["output-file-type"])
diff --git a/resources/tools/presentation/specification_CPTA.yaml b/resources/tools/presentation/specification_CPTA.yaml
index 2b9beee77a..cb031fe256 100644
--- a/resources/tools/presentation/specification_CPTA.yaml
+++ b/resources/tools/presentation/specification_CPTA.yaml
@@ -151,65 +151,67 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 380
+        start: 403
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master:
-        start: 46
+        start: 49
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 380
+        start: 403
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 46
+        start: 49
         end: "lastCompletedBuild"
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 132
+        start: 152
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 11
+        start: 14
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 132
+        start: 152
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 11
+        start: 14
         end: "lastCompletedBuild"
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 132
+        start: 152
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 11
+        start: 14
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 132
+        start: 152
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 11
+        start: 14
         end: "lastCompletedBuild"
 
   plot-layouts:
 
     plot-cpta:
       title: ""
-      autosize: False
+      titlefont:
+        size: 16
+      autosize: True
       showlegend: True
       width: 1100
       height: 800
@@ -293,26 +295,26 @@
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 380
+      start: 403
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master:
-      start: 46
+      start: 49
       end: "lastCompletedBuild"
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 132
+      start: 152
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 11
+      start: 14
       end: "lastCompletedBuild"
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 132
+      start: 152
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 11
+      start: 14
       end: "lastCompletedBuild"
 
 -
@@ -674,7 +676,7 @@
 
 # L2 - VIC-1227
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -682,7 +684,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -690,7 +692,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-vic1227-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -700,7 +702,7 @@
 
 # L2 - VIC-1385
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -708,7 +710,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -716,7 +718,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-vic1385-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -726,7 +728,7 @@
 
 # L2 - x520
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -734,7 +736,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -742,7 +744,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -750,7 +752,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -758,7 +760,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -766,7 +768,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -774,7 +776,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -782,7 +784,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -790,7 +792,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -798,7 +800,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -806,7 +808,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -814,7 +816,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -824,7 +826,7 @@
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -832,7 +834,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -840,7 +842,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -850,7 +852,7 @@
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -858,7 +860,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -866,7 +868,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -874,7 +876,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-1t1c"
       output-file-name: "l2-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -882,7 +884,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-2t2c"
       output-file-name: "l2-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -890,7 +892,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-4t4c"
       output-file-name: "l2-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -900,7 +902,7 @@
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -908,7 +910,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -916,7 +918,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -924,7 +926,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -932,7 +934,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -940,7 +942,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -948,7 +950,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -956,7 +958,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -964,7 +966,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -972,7 +974,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -980,7 +982,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -988,7 +990,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -998,7 +1000,7 @@
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-1t1c"
       output-file-name: "ip4-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
@@ -1006,7 +1008,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-2t2c"
       output-file-name: "ip4-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
@@ -1014,7 +1016,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-4t4c"
       output-file-name: "ip4-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
@@ -1024,7 +1026,7 @@
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -1032,7 +1034,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -1040,7 +1042,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -1048,7 +1050,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1056,7 +1058,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1064,7 +1066,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1074,7 +1076,7 @@
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -1082,7 +1084,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -1090,7 +1092,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -1100,7 +1102,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1108,7 +1110,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1116,7 +1118,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1126,7 +1128,7 @@
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1134,7 +1136,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1142,7 +1144,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1152,7 +1154,7 @@
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1160,7 +1162,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1168,7 +1170,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1178,7 +1180,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1186,7 +1188,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1194,7 +1196,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1204,7 +1206,7 @@
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1212,7 +1214,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1220,7 +1222,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1230,7 +1232,7 @@
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1238,7 +1240,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1246,7 +1248,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1256,7 +1258,7 @@
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1264,7 +1266,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1272,7 +1274,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1282,7 +1284,7 @@
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1290,7 +1292,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1298,7 +1300,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1308,7 +1310,7 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1316,7 +1318,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1324,7 +1326,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -1334,7 +1336,7 @@
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1342,7 +1344,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1350,7 +1352,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -1360,7 +1362,7 @@
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1368,7 +1370,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1376,7 +1378,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1386,7 +1388,7 @@
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1394,7 +1396,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1402,7 +1404,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1412,7 +1414,7 @@
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1421,7 +1423,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1429,7 +1431,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1437,7 +1439,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1446,7 +1448,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1454,7 +1456,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1464,7 +1466,7 @@
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1473,7 +1475,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1481,7 +1483,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1489,7 +1491,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1498,7 +1500,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1506,7 +1508,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1514,63 +1516,63 @@
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xl710, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## VM vhost - xl710, eth, 64B
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-1t1c"
+#      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-2t2c"
+#      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-4t4c"
+#      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## VM vhost - xl710, eth, IMIX
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-1t1c"
+#      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-2t2c"
+#      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-4t4c"
+#      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1578,7 +1580,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1586,7 +1588,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1596,7 +1598,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1604,7 +1606,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1612,7 +1614,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1622,7 +1624,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1631,7 +1633,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1639,7 +1641,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1649,7 +1651,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1658,7 +1660,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1666,7 +1668,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1676,7 +1678,7 @@
 
 # VTS - x520, 114B
 
-    - title: "VPP 1T1C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-1t1c"
       output-file-name: "vts-114b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '1T1C' and 'VHOST' and 'VTS'"
@@ -1684,7 +1686,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-2t2c"
       output-file-name: "vts-114b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '2T2C' and 'VHOST' and 'VTS'"
@@ -1692,7 +1694,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VTS 114B 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-4t4c"
       output-file-name: "vts-114b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '4T4C' and 'VHOST' and 'VTS'"
@@ -1702,7 +1704,7 @@
 
 # IPSec
 
-    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
       output-file-name: "ipsec-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1710,7 +1712,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
       output-file-name: "ipsec-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1718,7 +1720,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
       output-file-name: "ipsec-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1728,7 +1730,7 @@
 
 # SRv6 - x520
 
-    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-1t1c"
       output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
@@ -1736,7 +1738,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-2t2c"
       output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
@@ -1744,7 +1746,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-4t4c"
       output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
@@ -1752,33 +1754,33 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+#    - title: "3n-hsw-x520-srv6-imix-1t1c"
+#      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-2t2c"
+#      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-4t4c"
+#      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # Link Bonding - x520
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1786,7 +1788,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1794,7 +1796,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1802,7 +1804,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1810,7 +1812,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1818,7 +1820,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1828,7 +1830,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1836,7 +1838,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1844,7 +1846,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1852,7 +1854,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1860,7 +1862,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1868,7 +1870,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1878,7 +1880,7 @@
 
 # DPDK - x520 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1886,7 +1888,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1894,7 +1896,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1904,7 +1906,7 @@
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1912,7 +1914,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1920,7 +1922,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1930,7 +1932,7 @@
 
 # DPDK - xl710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1938,7 +1940,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1946,7 +1948,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -2037,7 +2039,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2045,7 +2047,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2053,7 +2055,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2061,7 +2063,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2069,7 +2071,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2077,7 +2079,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2087,7 +2089,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2095,7 +2097,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2103,7 +2105,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2111,7 +2113,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2119,7 +2121,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2127,7 +2129,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2137,7 +2139,7 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2145,7 +2147,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2153,7 +2155,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2161,7 +2163,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2169,7 +2171,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2177,7 +2179,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2187,7 +2189,7 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2195,7 +2197,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2203,7 +2205,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2211,7 +2213,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2219,7 +2221,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2227,7 +2229,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2237,7 +2239,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2245,7 +2247,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2253,7 +2255,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2263,7 +2265,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2271,7 +2273,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2279,7 +2281,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2289,7 +2291,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2297,7 +2299,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2305,7 +2307,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2315,7 +2317,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2323,7 +2325,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2331,7 +2333,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2341,7 +2343,7 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2349,7 +2351,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2357,7 +2359,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2367,7 +2369,7 @@
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2375,7 +2377,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2383,7 +2385,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2393,7 +2395,7 @@
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -2401,7 +2403,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -2409,7 +2411,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
@@ -2419,7 +2421,7 @@
 
 # Container memif - xxv710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2427,7 +2429,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2435,7 +2437,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -2445,7 +2447,7 @@
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2453,7 +2455,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2461,7 +2463,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2471,7 +2473,7 @@
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2479,7 +2481,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2487,7 +2489,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2497,7 +2499,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2505,7 +2507,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2513,7 +2515,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2523,7 +2525,7 @@
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2531,7 +2533,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2539,7 +2541,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2549,7 +2551,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2558,7 +2560,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2566,7 +2568,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2576,7 +2578,7 @@
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2585,7 +2587,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2593,7 +2595,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2603,7 +2605,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2612,7 +2614,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2620,7 +2622,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2630,7 +2632,7 @@
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2639,7 +2641,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2647,7 +2649,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2657,7 +2659,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-2t1c"
       output-file-name: "lb-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2665,7 +2667,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-4t2c"
       output-file-name: "lb-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2673,7 +2675,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-8t4c"
       output-file-name: "lb-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2681,7 +2683,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-2t1c"
       output-file-name: "lb-imix-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2689,7 +2691,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-4t2c"
       output-file-name: "lb-imix-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2697,7 +2699,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-8t4c"
       output-file-name: "lb-imix-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2705,59 +2707,59 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2765,7 +2767,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2773,7 +2775,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2809,7 +2811,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2817,7 +2819,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2825,7 +2827,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2864,7 +2866,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2872,7 +2874,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2880,7 +2882,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2888,7 +2890,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2896,7 +2898,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2904,7 +2906,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2914,7 +2916,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2922,7 +2924,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2930,7 +2932,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2938,7 +2940,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2946,7 +2948,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2954,7 +2956,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2964,7 +2966,7 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2972,7 +2974,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2980,7 +2982,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -2988,7 +2990,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2996,7 +2998,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -3004,7 +3006,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -3014,7 +3016,7 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -3022,7 +3024,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -3030,7 +3032,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
@@ -3038,7 +3040,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -3046,7 +3048,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -3054,7 +3056,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -3064,7 +3066,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3072,7 +3074,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3080,7 +3082,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3090,7 +3092,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3098,7 +3100,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3106,7 +3108,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -3116,7 +3118,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3124,7 +3126,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3132,7 +3134,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3142,7 +3144,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3150,7 +3152,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3158,7 +3160,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3168,7 +3170,7 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
@@ -3176,7 +3178,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
@@ -3184,7 +3186,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
@@ -3194,7 +3196,7 @@
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -3202,7 +3204,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -3210,7 +3212,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
@@ -3220,7 +3222,7 @@
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr"
       output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3228,7 +3230,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr"
       output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3236,7 +3238,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr"
       output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3246,7 +3248,7 @@
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3254,7 +3256,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3262,7 +3264,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3272,7 +3274,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3280,7 +3282,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3288,7 +3290,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3298,7 +3300,7 @@
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3306,7 +3308,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3314,7 +3316,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3324,7 +3326,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3333,7 +3335,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3341,7 +3343,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3351,7 +3353,7 @@
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3360,7 +3362,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3368,7 +3370,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3378,7 +3380,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3387,7 +3389,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3395,7 +3397,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
@@ -3405,7 +3407,7 @@
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3414,7 +3416,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3422,7 +3424,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3432,7 +3434,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-2t1c"
       output-file-name: "lb-64b-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
@@ -3440,7 +3442,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-4t2c"
       output-file-name: "lb-64b-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
@@ -3448,7 +3450,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-8t4c"
       output-file-name: "lb-64b-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
@@ -3456,7 +3458,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-2t1c"
       output-file-name: "lb-imix-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
@@ -3464,7 +3466,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-4t2c"
       output-file-name: "lb-imix-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
@@ -3472,7 +3474,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-8t4c"
       output-file-name: "lb-imix-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
@@ -3480,59 +3482,59 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -3540,7 +3542,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -3548,7 +3550,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -3584,7 +3586,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -3592,7 +3594,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -3600,7 +3602,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
diff --git a/resources/tools/presentation_new/generator_CPTA.py b/resources/tools/presentation_new/generator_CPTA.py
index 5d088ca94e..b42b639fe4 100644
--- a/resources/tools/presentation_new/generator_CPTA.py
+++ b/resources/tools/presentation_new/generator_CPTA.py
@@ -399,8 +399,8 @@ def _generate_all_charts(spec, input_data):
 
         if traces:
             # Generate the chart:
-            graph["layout"]["xaxis"]["title"] = \
-                graph["layout"]["xaxis"]["title"].format(job=job_name)
+            graph["layout"]["title"] = \
+                "<b>{title}</b>".format(title=graph.get("title", ""))
             name_file = "{0}-{1}{2}".format(spec.cpta["output-file"],
                                             graph["output-file-name"],
                                             spec.cpta["output-file-type"])
diff --git a/resources/tools/presentation_new/specification_CPTA.yaml b/resources/tools/presentation_new/specification_CPTA.yaml
index 3657df54fe..90366f0442 100644
--- a/resources/tools/presentation_new/specification_CPTA.yaml
+++ b/resources/tools/presentation_new/specification_CPTA.yaml
@@ -84,65 +84,67 @@
     # 3n-hsw
     plot-performance-trending-all-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 346
+        start: 403
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master:
-        start: 43
+        start: 49
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-hsw:
       csit-vpp-perf-mrr-daily-master:
-        start: 346
+        start: 403
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-hsw:
       csit-dpdk-perf-mrr-weekly-master:
-        start: 43
+        start: 49
         end: "lastCompletedBuild"
 
     # 3n-skx
     plot-performance-trending-all-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 100
+        start: 152
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 8
+        start: 14
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-3n-skx:
       csit-vpp-perf-mrr-daily-master-3n-skx:
-        start: 100
+        start: 152
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-3n-skx:
       csit-dpdk-perf-mrr-weekly-master-3n-skx:
-        start: 8
+        start: 14
         end: "lastCompletedBuild"
 
     # 2n-skx
     plot-performance-trending-all-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 100
+        start: 152
         end: "lastCompletedBuild"
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 8
+        start: 14
         end: "lastCompletedBuild"
 
     plot-performance-trending-vpp-2n-skx:
       csit-vpp-perf-mrr-daily-master-2n-skx:
-        start: 100
+        start: 152
         end: "lastCompletedBuild"
 
     plot-performance-trending-dpdk-2n-skx:
       csit-dpdk-perf-mrr-weekly-master-2n-skx:
-        start: 8
+        start: 14
         end: "lastCompletedBuild"
 
   plot-layouts:
 
     plot-cpta:
       title: ""
-      autosize: False
+      titlefont:
+        size: 16
+      autosize: True
       showlegend: True
       width: 1100
       height: 800
@@ -226,26 +228,26 @@
 
     # 3n-hsw
     csit-vpp-perf-mrr-daily-master:
-      start: 346
+      start: 403
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master:
-      start: 43
+      start: 49
       end: "lastCompletedBuild"
 
     # 3n-skx
     csit-vpp-perf-mrr-daily-master-3n-skx:
-      start: 100
+      start: 152
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-3n-skx:
-      start: 8
+      start: 14
       end: "lastCompletedBuild"
 
     # 2n-skx
     csit-vpp-perf-mrr-daily-master-2n-skx:
-      start: 100
+      start: 152
       end: "lastCompletedBuild"
     csit-dpdk-perf-mrr-weekly-master-2n-skx:
-      start: 8
+      start: 14
       end: "lastCompletedBuild"
 
 -
@@ -605,9 +607,61 @@
 ################################################################################
 # 3n-hsw
 
+# L2 - VIC-1227
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-vic1227-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1227-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1227' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+# L2 - VIC-1385
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-1t1c"
+      output-file-name: "l2-1t1c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-2t2c"
+      output-file-name: "l2-2t2c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
+    - title: "3n-hsw-vic1385-l2sw-64b-base-scale-4t4c"
+      output-file-name: "l2-4t4c-vic1385-3n-hsw"
+      data: "plot-performance-trending-vpp-3n-hsw"
+      filter: "'NIC_Cisco-VIC-1385' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
+      parameters:
+      - "result"
+      layout: "plot-cpta"
+
 # L2 - x520
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -615,7 +669,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -623,7 +677,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -631,7 +685,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -639,7 +693,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -647,7 +701,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-iacl-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -655,7 +709,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -663,7 +717,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -671,7 +725,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-oacl-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'MACIP' and not 'VHOST' and not 'MEMIF'"
@@ -679,7 +733,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-1t1c"
       output-file-name: "l2-feature-1t1c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -687,7 +741,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-2t2c"
       output-file-name: "l2-feature-2t2c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -695,7 +749,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MACIP MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-64b-features-macip-4t4c"
       output-file-name: "l2-feature-4t4c-x520-3n-hsw-macip"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and 'MACIP' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'VHOST' and not 'MEMIF'"
@@ -705,7 +759,7 @@
 
 # L2 - xl710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -713,7 +767,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -721,7 +775,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -731,7 +785,7 @@
 
 # L2 - x710
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-1t1c"
       output-file-name: "l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -739,7 +793,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-2t2c"
       output-file-name: "l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -747,7 +801,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-base-scale-4t4c"
       output-file-name: "l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'DRV_AVF'"
@@ -755,7 +809,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-1t1c"
       output-file-name: "l2-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -763,7 +817,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-2t2c"
       output-file-name: "l2-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -771,7 +825,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-64b-features-4t4c"
       output-file-name: "l2-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -781,31 +835,31 @@
 
 # IPv4 - x520
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and ('BASE' or 'FIB_1M') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -813,7 +867,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -821,7 +875,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B IACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-iacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-iacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'IACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -829,7 +883,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -837,7 +891,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -845,7 +899,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B OACL MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-oacl-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw-oacl"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and 'OACL' and ('ACL1' or 'ACL50') and '10k_FLOWS' and not 'IPSEC' and not 'VHOST'"
@@ -853,7 +907,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -861,7 +915,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -869,7 +923,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'NAT44' and('BASE' or 'SRC_USER_4000') and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -879,57 +933,57 @@
 
 # IPv4 - xl710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-1t1c"
       output-file-name: "ip4-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-2t2c"
       output-file-name: "ip4-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-64b-base-scale-features-4t4c"
       output-file-name: "ip4-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # IPv4 - x710
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-1t1c"
       output-file-name: "ip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '1T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-2t2c"
       output-file-name: "ip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-base-scale-4t4c"
       output-file-name: "ip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-1t1c"
       output-file-name: "ip4-feature-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '1T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -937,7 +991,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-2t2c"
       output-file-name: "ip4-feature-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -945,7 +999,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-64b-features-4t4c"
       output-file-name: "ip4-feature-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -955,7 +1009,7 @@
 
 # IPv4 Tunnels - x520
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -963,7 +1017,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -971,7 +1025,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and 'LISP' and 'IP6UNRLAY' and 'IP4OVRLAY' and not 'VHOST' and not 'IPSECHW'"
@@ -981,7 +1035,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 1T1C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-1t1c"
       output-file-name: "ip4-tunnels-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '1T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -989,7 +1043,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-2t2c"
       output-file-name: "ip4-tunnels-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -997,7 +1051,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv4 Tunnels 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4tun-64b-base-4t4c"
       output-file-name: "ip4-tunnels-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -1007,7 +1061,7 @@
 
 # IPv6 - x520
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1015,7 +1069,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1023,7 +1077,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'MRR' and '78B' and 'BASE' and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'SRv6' and not 'DOT1Q'"
@@ -1033,7 +1087,7 @@
 
 # IPv6 - xl710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1041,7 +1095,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1049,7 +1103,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST'"
@@ -1059,7 +1113,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 1T1C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-1t1c"
       output-file-name: "ip6-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '1T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1067,7 +1121,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-2t2c"
       output-file-name: "ip6-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1075,7 +1129,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip6-78b-base-scale-4t4c"
       output-file-name: "ip6-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -1085,163 +1139,163 @@
 
 # Container memif - x520, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x520, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X520-DA2' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xl710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XL710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, 64B
 
-    - title: "VPP 1T1C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-1t1c"
       output-file-name: "container-memif-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-2t2c"
       output-file-name: "container-memif-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-64b-base-4t4c"
       output-file-name: "container-memif-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 1T1C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-1t1c"
       output-file-name: "container-memif-imix-l2-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '1T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-2t2c"
       output-file-name: "container-memif-imix-l2-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C L2 Container memif IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-memif-imix-base-4t4c"
       output-file-name: "container-memif-imix-l2-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x520, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1249,7 +1303,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1257,7 +1311,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1267,7 +1321,7 @@
 
 # VM vhost - x520, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1275,7 +1329,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1283,7 +1337,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1293,7 +1347,7 @@
 
 # VM vhost - x520, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1302,7 +1356,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1310,7 +1364,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2xc-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1318,7 +1372,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1327,7 +1381,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1335,7 +1389,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-64b-base-l2bd-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1345,7 +1399,7 @@
 
 # VM vhost - x520, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1354,7 +1408,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1362,7 +1416,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2XC IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2xc-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2xc"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2XCFWD' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1370,7 +1424,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1379,7 +1433,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1387,7 +1441,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth L2BD IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-l2sw-vhost-imix-base-l2bd-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x520-3n-hsw-l2bd"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST_1024' and 'L2BDMACLRN' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'CFS_OPT'"
@@ -1395,63 +1449,63 @@
       - "result"
       layout: "plot-cpta"
 
-# VM vhost - xl710, eth, 64B
-
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-# VM vhost - xl710, eth, IMIX
-
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## VM vhost - xl710, eth, 64B
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-1t1c"
+#      output-file-name: "vm-vhost-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-2t2c"
+#      output-file-name: "vm-vhost-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-64b-base-4t4c"
+#      output-file-name: "vm-vhost-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
-      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## VM vhost - xl710, eth, IMIX
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-1t1c"
+#      output-file-name: "vm-vhost-imix-eth-1t1c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-2t2c"
+#      output-file-name: "vm-vhost-imix-eth-2t2c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-xl710-l2sw-vhost-imix-base-4t4c"
+#      output-file-name: "vm-vhost-imix-eth-4t4c-xl710-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-XL710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 1T1C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1459,7 +1513,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1467,7 +1521,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1477,7 +1531,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 1T1C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-ethip4-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1485,7 +1539,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-ethip4-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1493,7 +1547,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost ethip4 IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-ip4-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-ethip4-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -1503,7 +1557,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 1T1C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-1t1c"
       output-file-name: "vm-vhost-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1512,7 +1566,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-2t2c"
       output-file-name: "vm-vhost-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1520,7 +1574,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-64b-base-4t4c"
       output-file-name: "vm-vhost-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1530,7 +1584,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 1T1C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-1t1c"
       output-file-name: "vm-vhost-imix-eth-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1539,7 +1593,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-2t2c"
       output-file-name: "vm-vhost-imix-eth-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1547,7 +1601,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VM vhost eth IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-l2sw-vhost-imix-base-4t4c"
       output-file-name: "vm-vhost-imix-eth-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -1557,7 +1611,7 @@
 
 # VTS - x520, 114B
 
-    - title: "VPP 1T1C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-1t1c"
       output-file-name: "vts-114b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '1T1C' and 'VHOST' and 'VTS'"
@@ -1565,7 +1619,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C VTS 114B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-2t2c"
       output-file-name: "vts-114b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '2T2C' and 'VHOST' and 'VTS'"
@@ -1573,7 +1627,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C VTS 114B 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-vts-114b-4t4c"
       output-file-name: "vts-114b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '114B' and 'MRR' and '4T4C' and 'VHOST' and 'VTS'"
@@ -1583,7 +1637,7 @@
 
 # IPSec
 
-    - title: "VPP 1T1C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-1t1c"
       output-file-name: "ipsec-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '1T1C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1591,7 +1645,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-2t2c"
       output-file-name: "ipsec-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '2T2C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1599,7 +1653,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C IPSec 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-ip4-ipsechw-64b-base-scale-4t4c"
       output-file-name: "ipsec-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'IP4FWD' and 'MRR' and '4T4C' and 'IPSECHW' and ('IPSECTRAN' or 'IPSECTUN') and not 'VHOST'"
@@ -1609,7 +1663,7 @@
 
 # SRv6 - x520
 
-    - title: "VPP 1T1C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-1t1c"
       output-file-name: "srv6-78b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '1T1C' and 'SRv6'"
@@ -1617,7 +1671,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-2t2c"
       output-file-name: "srv6-78b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '2T2C' and 'SRv6'"
@@ -1625,7 +1679,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C SRv6 78B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-srv6-78b-4t4c"
       output-file-name: "srv6-78b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '78B' and 'MRR' and '4T4C' and 'SRv6'"
@@ -1633,33 +1687,33 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T2C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T4C SRv6 IMIX MRR Trending 3n-hsw"
-      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
-      data: "plot-performance-trending-vpp-3n-hsw"
-      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+#    - title: "3n-hsw-x520-srv6-imix-1t1c"
+#      output-file-name: "srv6-imix-1t1c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-2t2c"
+#      output-file-name: "srv6-imix-2t2c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "3n-hsw-x520-srv6-imix-4t4c"
+#      output-file-name: "srv6-imix-4t4c-x520-3n-hsw"
+#      data: "plot-performance-trending-vpp-3n-hsw"
+#      filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'SRv6'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # Link Bonding - x520
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1667,7 +1721,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1675,7 +1729,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1683,7 +1737,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1691,7 +1745,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1699,7 +1753,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND' and not 'LBOND_DPDK'"
@@ -1709,7 +1763,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 1T1C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-1t1c"
       output-file-name: "lb-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1717,7 +1771,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-2t2c"
       output-file-name: "lb-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1725,7 +1779,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-64b-4t4c"
       output-file-name: "lb-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1733,7 +1787,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 1T1C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-1t1c"
       output-file-name: "lb-imix-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '1T1C' and 'LBOND'"
@@ -1741,7 +1795,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T2C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-2t2c"
       output-file-name: "lb-imix-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T2C' and 'LBOND'"
@@ -1749,7 +1803,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T4C Link Bonding IMIX MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-lb-imix-4t4c"
       output-file-name: "lb-imix-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-vpp-3n-hsw"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T4C' and 'LBOND'"
@@ -1759,7 +1813,7 @@
 
 # DPDK - x520 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1767,7 +1821,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1775,7 +1829,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x520-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x520-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X520-DA2' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1785,7 +1839,7 @@
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1793,7 +1847,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1801,7 +1855,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-x710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-x710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1811,7 +1865,7 @@
 
 # DPDK - xl710 - 64B
 
-    - title: "DPDK 1T1C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-1t1c"
       output-file-name: "dpdk-64b-1t1c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '1T1C' and 'DPDK'"
@@ -1819,7 +1873,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 2T2C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-2t2c"
       output-file-name: "dpdk-64b-2t2c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '2T2C' and 'DPDK'"
@@ -1827,7 +1881,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T4C 64B MRR Trending 3n-hsw"
+    - title: "3n-hsw-xl710-dpdk-64b-4t4c"
       output-file-name: "dpdk-64b-4t4c-xl710-3n-hsw"
       data: "plot-performance-trending-dpdk-3n-hsw"
       filter: "'NIC_Intel-XL710' and '64B' and 'MRR' and '4T4C' and 'DPDK'"
@@ -1918,7 +1972,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1926,7 +1980,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1934,7 +1988,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1942,7 +1996,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1950,7 +2004,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1958,7 +2012,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1968,7 +2022,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1976,7 +2030,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1984,7 +2038,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -1992,7 +2046,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2000,7 +2054,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2008,7 +2062,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2018,31 +2072,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2050,7 +2104,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2058,7 +2112,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2068,7 +2122,7 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2076,7 +2130,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2084,7 +2138,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST'"
@@ -2092,7 +2146,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2100,7 +2154,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2108,7 +2162,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2118,7 +2172,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2126,7 +2180,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2134,7 +2188,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2144,7 +2198,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2152,7 +2206,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2160,7 +2214,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2170,7 +2224,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2178,7 +2232,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2186,7 +2240,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2196,7 +2250,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2204,7 +2258,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2212,7 +2266,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -2222,111 +2276,111 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - x710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q'"
+      filter: "'NIC_Intel-X710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'DOT1Q' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, IMIX
 
-    - title: "VPP 2T1C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-2t1c"
       output-file-name: "container-memif-imix-l2-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-4t2c"
       output-file-name: "container-memif-imix-l2-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-memif-imix-base-8t4c"
       output-file-name: "container-memif-imix-l2-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and 'IMIX' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2334,7 +2388,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2342,7 +2396,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2352,7 +2406,7 @@
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2360,7 +2414,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2368,7 +2422,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2378,7 +2432,7 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2386,7 +2440,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2394,7 +2448,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2404,7 +2458,7 @@
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2412,7 +2466,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2420,7 +2474,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -2430,7 +2484,7 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2439,7 +2493,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2447,7 +2501,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2457,7 +2511,7 @@
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2466,7 +2520,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2474,7 +2528,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2484,7 +2538,7 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2493,7 +2547,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2501,7 +2555,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2511,7 +2565,7 @@
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2520,7 +2574,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2528,7 +2582,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -2538,7 +2592,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-2t1c"
       output-file-name: "lb-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2546,7 +2600,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-4t2c"
       output-file-name: "lb-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2554,7 +2608,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-64b-8t4c"
       output-file-name: "lb-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2562,7 +2616,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-2t1c"
       output-file-name: "lb-imix-2t1c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
@@ -2570,7 +2624,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-4t2c"
       output-file-name: "lb-imix-4t2c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
@@ -2578,7 +2632,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+    - title: "3n-skx-x710-lb-imix-8t4c"
       output-file-name: "lb-imix-8t4c-x710-3n-skx"
       data: "plot-performance-trending-vpp-3n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
@@ -2586,59 +2640,59 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
-      data: "plot-performance-trending-vpp-3n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 3n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 3n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-3n-skx"
+#      data: "plot-performance-trending-vpp-3n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND_VPP'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2646,7 +2700,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2654,7 +2708,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-x710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-x710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2690,7 +2744,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -2698,7 +2752,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -2706,7 +2760,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 3n-skx"
+    - title: "3n-skx-xxv710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-xxv710-3n-skx"
       data: "plot-performance-trending-dpdk-3n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -2745,7 +2799,7 @@
 
 # L2 - x710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2753,7 +2807,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2761,7 +2815,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK'"
@@ -2769,7 +2823,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2777,7 +2831,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2785,7 +2839,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2795,7 +2849,7 @@
 
 # L2 - xxv710
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-2t1c"
       output-file-name: "l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2803,7 +2857,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-4t2c"
       output-file-name: "l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2811,7 +2865,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-base-scale-8t4c"
       output-file-name: "l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'MEMIF' and not 'POLICE_MARK' and not 'DRV_AVF'"
@@ -2819,7 +2873,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-2t1c"
       output-file-name: "l2-feature-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2827,7 +2881,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-4t2c"
       output-file-name: "l2-feature-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2835,7 +2889,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-64b-features-8t4c"
       output-file-name: "l2-feature-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'MEMIF'"
@@ -2845,31 +2899,31 @@
 
 # IPv4 - x710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2877,7 +2931,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2885,7 +2939,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2895,31 +2949,31 @@
 
 # IPv4 - xxv710
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-2t1c"
       output-file-name: "ip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '2T1C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-4t2c"
       output-file-name: "ip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '4T2C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-base-scale-8t4c"
       output-file-name: "ip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and ('BASE' or 'SCALE') and '8T4C' and 'IP4FWD' and not 'FEATURE' and not 'IPSEC' and not 'VHOST' and not 'POLICE_MARK' and not 'MEMIF'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-2t1c"
       output-file-name: "ip4-feature-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '2T1C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2927,7 +2981,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-4t2c"
       output-file-name: "ip4-feature-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '4T2C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2935,7 +2989,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-64b-features-8t4c"
       output-file-name: "ip4-feature-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'FEATURE' and '8T4C' and 'IP4FWD' and not 'IPSEC' and not 'VHOST'"
@@ -2945,7 +2999,7 @@
 
 # IPv4 Tunnels - x710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2953,7 +3007,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2961,7 +3015,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2971,7 +3025,7 @@
 
 # IPv4 Tunnels - xxv710
 
-    - title: "VPP 2T1C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-2t1c"
       output-file-name: "ip4-tunnels-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '2T1C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2979,7 +3033,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-4t2c"
       output-file-name: "ip4-tunnels-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '4T2C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2987,7 +3041,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv4 Tunnels 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4tun-64b-base-8t4c"
       output-file-name: "ip4-tunnels-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'ENCAP' and 'MRR' and '8T4C' and ('VXLAN' or 'VXLANGPE' or 'LISP' or 'LISPGPE' or 'GRE') and not 'VHOST' and not 'IPSECHW'"
@@ -2997,7 +3051,7 @@
 
 # IPv6 - x710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3005,7 +3059,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3013,7 +3067,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3023,7 +3077,7 @@
 
 # IPv6 - xxv710
 
-    - title: "VPP 2T1C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-2t1c"
       output-file-name: "ip6-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '2T1C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3031,7 +3085,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-4t2c"
       output-file-name: "ip6-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '4T2C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3039,7 +3093,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C IPv6 78B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip6-78b-base-scale-8t4c"
       output-file-name: "ip6-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'MRR' and '78B' and ('BASE' or 'SCALE' or 'FEATURE') and '8T4C' and 'IP6FWD' and not 'IPSEC' and not 'VHOST' and not 'DOT1Q'"
@@ -3049,85 +3103,85 @@
 
 # Container memif - x710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF'"
+      filter: "'NIC_Intel-X710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD' or 'L2PATCH') and not 'VHOST' and not 'DRV_AVF' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # Container memif - xxv710, 64B
 
-    - title: "VPP 2T1C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-2t1c"
       output-file-name: "container-memif-l2-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '2T1C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-4t2c"
       output-file-name: "container-memif-l2-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '4T2C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C L2 Container memif 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-memif-64b-base-8t4c"
       output-file-name: "container-memif-l2-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST'"
+      filter: "'NIC_Intel-XXV710' and 'MRR' and '64B' and 'BASE' and '8T4C' and 'MEMIF' and ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'VHOST' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - x710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-2t1c-mrr"
       output-file-name: "vm-vhost-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-4t2c-mrr"
       output-file-name: "vm-vhost-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-64b-base-8t4c-mrr"
       output-file-name: "vm-vhost-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, ethip4, 64B
 
-    - title: "VPP 2T1C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-ethip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3135,7 +3189,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-ethip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3143,7 +3197,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-ethip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3153,33 +3207,33 @@
 
 # VM vhost - x710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, ethip4, IMIX
 
-    - title: "VPP 2T1C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-ethip4-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3187,7 +3241,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-ethip4-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3195,7 +3249,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost ethip4 IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-ip4-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-ethip4-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not ('L2BDMACSTAT' or 'L2BDMACLRN' or 'L2XCFWD') and not 'LBOND' and not 'VTS'"
@@ -3205,34 +3259,34 @@
 
 # VM vhost - x710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, eth, 64B
 
-    - title: "VPP 2T1C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-2t1c"
       output-file-name: "vm-vhost-eth-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3241,7 +3295,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-4t2c"
       output-file-name: "vm-vhost-eth-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3249,7 +3303,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-64b-base-8t4c"
       output-file-name: "vm-vhost-eth-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3259,34 +3313,34 @@
 
 # VM vhost - x710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
 
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
+      filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS' and not 'NF_DENSITY'"
       parameters:
       - "result"
       layout: "plot-cpta"
 
 # VM vhost - xxv710, eth, IMIX
 
-    - title: "VPP 2T1C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-2t1c"
       output-file-name: "vm-vhost-imix-eth-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3295,7 +3349,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-4t2c"
       output-file-name: "vm-vhost-imix-eth-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3303,7 +3357,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C VM vhost eth IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-l2sw-vhost-imix-base-8t4c"
       output-file-name: "vm-vhost-imix-eth-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'VHOST' and not 'VXLAN' and not 'IP4FWD' and not 'LBOND' and not 'VTS'"
@@ -3313,7 +3367,7 @@
 
 # Link Bonding - x710
 
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-2t1c"
       output-file-name: "lb-64b-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
@@ -3321,7 +3375,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-4t2c"
       output-file-name: "lb-64b-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
@@ -3329,7 +3383,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-64b-8t4c"
       output-file-name: "lb-64b-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
@@ -3337,7 +3391,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-2t1c"
       output-file-name: "lb-imix-2t1c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
@@ -3345,7 +3399,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-4t2c"
       output-file-name: "lb-imix-4t2c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
@@ -3353,7 +3407,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+    - title: "2n-skx-x710-lb-imix-8t4c"
       output-file-name: "lb-imix-8t4c-x710-2n-skx"
       data: "plot-performance-trending-vpp-2n-skx"
       filter: "'NIC_Intel-X710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
@@ -3361,59 +3415,59 @@
       - "result"
       layout: "plot-cpta"
 
-# Link Bonding - xxv710
-
-    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
-      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
-
-    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
-      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
-      data: "plot-performance-trending-vpp-2n-skx"
-      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
-      parameters:
-      - "result"
-      layout: "plot-cpta"
+## Link Bonding - xxv710
+#
+#    - title: "VPP 2T1C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding 64B MRR Trending 2n-skx"
+#      output-file-name: "lb-64b-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 2T1C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-2t1c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '2T1C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 4T2C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-4t2c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '4T2C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
+#
+#    - title: "VPP 8T4C Link Bonding IMIX MRR Trending 2n-skx"
+#      output-file-name: "lb-imix-8t4c-xxv710-2n-skx"
+#      data: "plot-performance-trending-vpp-2n-skx"
+#      filter: "'NIC_Intel-XXV710' and 'IMIX' and 'MRR' and '8T4C' and 'LBOND'"
+#      parameters:
+#      - "result"
+#      layout: "plot-cpta"
 
 # DPDK - x710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -3421,7 +3475,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -3429,7 +3483,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-x710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-x710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-X710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"
@@ -3465,7 +3519,7 @@
 
 # DPDK - xxv710 - 64B
 
-    - title: "DPDK 2T1C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-2t1c"
       output-file-name: "dpdk-64b-2t1c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '2T1C' and 'DPDK'"
@@ -3473,7 +3527,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 4T2C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-4t2c"
       output-file-name: "dpdk-64b-4t2c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '4T2C' and 'DPDK'"
@@ -3481,7 +3535,7 @@
       - "result"
       layout: "plot-cpta"
 
-    - title: "DPDK 8T4C 64B MRR Trending 2n-skx"
+    - title: "2n-skx-xxv710-dpdk-64b-8t4c"
       output-file-name: "dpdk-64b-8t4c-xxv710-2n-skx"
       data: "plot-performance-trending-dpdk-2n-skx"
       filter: "'NIC_Intel-XXV710' and '64B' and 'MRR' and '8T4C' and 'DPDK'"