diff --git a/includes/html/graphs/application/hv-monitor_cow.inc.php b/includes/html/graphs/application/hv-monitor_cow.inc.php
index af700c0339..df1c06ca9a 100644
--- a/includes/html/graphs/application/hv-monitor_cow.inc.php
+++ b/includes/html/graphs/application/hv-monitor_cow.inc.php
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'COW',
-        'ds'       => 'cow',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'COW';
+    $ds = 'cow';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_disk-freqs.inc.php b/includes/html/graphs/application/hv-monitor_disk-freqs.inc.php
index 49517db819..2df199a1d9 100644
--- a/includes/html/graphs/application/hv-monitor_disk-freqs.inc.php
+++ b/includes/html/graphs/application/hv-monitor_disk-freqs.inc.php
@@ -16,15 +16,12 @@ if (isset($vars['vmdisk']) && isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Flushes',
-        'ds'       => 'freqs',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Flushes';
+    $ds = 'freqs';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_disk-ftime.inc.php b/includes/html/graphs/application/hv-monitor_disk-ftime.inc.php
index 5253448ae5..f0f85736a2 100644
--- a/includes/html/graphs/application/hv-monitor_disk-ftime.inc.php
+++ b/includes/html/graphs/application/hv-monitor_disk-ftime.inc.php
@@ -16,15 +16,12 @@ if (isset($vars['vmdisk']) && isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Flush Time',
-        'ds'       => 'ftime',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Flush Time';
+    $ds = 'ftime';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_etimes.inc.php b/includes/html/graphs/application/hv-monitor_etimes.inc.php
index c190b914a0..dce72a6935 100644
--- a/includes/html/graphs/application/hv-monitor_etimes.inc.php
+++ b/includes/html/graphs/application/hv-monitor_etimes.inc.php
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Etimes',
-        'ds'       => 'etimes',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Etimes';
+    $ds = 'etimes';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_net-coll.inc.php b/includes/html/graphs/application/hv-monitor_net-coll.inc.php
index 8bb9241208..448124f045 100644
--- a/includes/html/graphs/application/hv-monitor_net-coll.inc.php
+++ b/includes/html/graphs/application/hv-monitor_net-coll.inc.php
@@ -16,15 +16,12 @@ if (isset($vars['vmif'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Collisions',
-        'ds'       => 'coll',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Collisions';
+    $ds = 'coll';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_pcpu.inc.php b/includes/html/graphs/application/hv-monitor_pcpu.inc.php
index de2a273703..a70f0db9ea 100644
--- a/includes/html/graphs/application/hv-monitor_pcpu.inc.php
+++ b/includes/html/graphs/application/hv-monitor_pcpu.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 $name = 'hv-monitor';
-$unit_text = 'Memory Usage %';
+$unit_text = 'CPU Usage %';
 $colours = 'psychedelic';
 $dostack = 0;
 $printtotal = 0;
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'CPU%',
-        'ds'       => 'pcpu',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'CPU%';
+    $ds = 'pcpu';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_snaps.inc.php b/includes/html/graphs/application/hv-monitor_snaps.inc.php
index da8e65e0fd..d6cf793204 100644
--- a/includes/html/graphs/application/hv-monitor_snaps.inc.php
+++ b/includes/html/graphs/application/hv-monitor_snaps.inc.php
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Snaps',
-        'ds'       => 'snaps',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Snaps';
+    $ds = 'snaps';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';
diff --git a/includes/html/graphs/application/hv-monitor_snaps_size.inc.php b/includes/html/graphs/application/hv-monitor_snaps_size.inc.php
index 9416d782fd..3058ebb35b 100644
--- a/includes/html/graphs/application/hv-monitor_snaps_size.inc.php
+++ b/includes/html/graphs/application/hv-monitor_snaps_size.inc.php
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
     $rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
 }
 
-$rrd_list = [];
 if (Rrd::checkRrdExists($rrd_filename)) {
-    $rrd_list[] = [
-        'filename' => $rrd_filename,
-        'descr'    => 'Snap Size',
-        'ds'       => 'snaps_size',
-    ];
+    $filename = $rrd_filename;
+    $descr = 'Snaps Size';
+    $ds = 'snaps_size';
 } else {
     d_echo('RRD "' . $rrd_filename . '" not found');
 }
 
-require 'includes/html/graphs/generic_multi_line.inc.php';
+require 'includes/html/graphs/generic_stats.inc.php';