diff --git a/html/includes/graphs/device/netstat_icmp.inc.php b/html/includes/graphs/device/netstat_icmp.inc.php
index 92c34c358..c05eb8328 100644
--- a/html/includes/graphs/device/netstat_icmp.inc.php
+++ b/html/includes/graphs/device/netstat_icmp.inc.php
@@ -33,7 +33,7 @@ $colours='mixed';
 
 $scale_min = "0";
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = TRUE;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_icmp_info.inc.php b/html/includes/graphs/device/netstat_icmp_info.inc.php
index 8e919929a..73530852a 100644
--- a/html/includes/graphs/device/netstat_icmp_info.inc.php
+++ b/html/includes/graphs/device/netstat_icmp_info.inc.php
@@ -33,7 +33,7 @@ $colours='mixed';
 
 $scale_min = "0";
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = TRUE;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_ip.inc.php b/html/includes/graphs/device/netstat_ip.inc.php
index 3d29d6391..a065d16ed 100644
--- a/html/includes/graphs/device/netstat_ip.inc.php
+++ b/html/includes/graphs/device/netstat_ip.inc.php
@@ -30,7 +30,7 @@ $colours='mixed';
 
 $scale_min = "0";
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = TRUE;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_snmp.inc.php b/html/includes/graphs/device/netstat_snmp.inc.php
index 67ac578f6..dfcc845ee 100644
--- a/html/includes/graphs/device/netstat_snmp.inc.php
+++ b/html/includes/graphs/device/netstat_snmp.inc.php
@@ -30,7 +30,7 @@ $colours='mixed';
 
 $scale_min = "0";
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = TRUE;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_snmp_pkt.inc.php b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
index 66313b238..b184418de 100644
--- a/html/includes/graphs/device/netstat_snmp_pkt.inc.php
+++ b/html/includes/graphs/device/netstat_snmp_pkt.inc.php
@@ -24,7 +24,7 @@ foreach($stats as $stat)
 $colours='mixed';
 
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = TRUE;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_tcp.inc.php b/html/includes/graphs/device/netstat_tcp.inc.php
index 99075102f..8a12bd1b1 100644
--- a/html/includes/graphs/device/netstat_tcp.inc.php
+++ b/html/includes/graphs/device/netstat_tcp.inc.php
@@ -23,7 +23,7 @@ foreach($stats as $stat)
 $colours='mixed';
 
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = 1;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/netstat_udp.inc.php b/html/includes/graphs/device/netstat_udp.inc.php
index 73d46eb6e..aaa0e2e4f 100644
--- a/html/includes/graphs/device/netstat_udp.inc.php
+++ b/html/includes/graphs/device/netstat_udp.inc.php
@@ -23,7 +23,7 @@ foreach($stats as $stat)
 $colours='mixed';
 
 $nototal = 1;
-$basicrrd = 1;
+$simple_rrd = 1;
 
 include("includes/graphs/generic_multi_line.inc.php");
 
diff --git a/html/includes/graphs/device/nfsen_common.inc.php b/html/includes/graphs/device/nfsen_common.inc.php
index d172891b2..fc36a36c6 100644
--- a/html/includes/graphs/device/nfsen_common.inc.php
+++ b/html/includes/graphs/device/nfsen_common.inc.php
@@ -1,5 +1,4 @@
 <?php
-include("includes/graphs/common.inc.php");
 
 $simple_rrd = TRUE;
 
diff --git a/html/includes/graphs/generic_multi_line.inc.php b/html/includes/graphs/generic_multi_line.inc.php
index 78adb1dd4..0ce6cd738 100644
--- a/html/includes/graphs/generic_multi_line.inc.php
+++ b/html/includes/graphs/generic_multi_line.inc.php
@@ -27,7 +27,7 @@ foreach ($rrd_list as $rrd)
 
   $rrd_options .= " DEF:".$id."=$filename:$ds:AVERAGE";
 
-  if ($simple_rrd || $basicrrd)
+  if ($simple_rrd)
   {
     $rrd_options .= " CDEF:".$id."min=".$id." ";
     $rrd_options .= " CDEF:".$id."max=".$id." ";
diff --git a/html/includes/graphs/generic_multi_simplex_seperated.inc.php b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
index 740715cb3..719a11ca5 100644
--- a/html/includes/graphs/generic_multi_simplex_seperated.inc.php
+++ b/html/includes/graphs/generic_multi_simplex_seperated.inc.php
@@ -25,7 +25,7 @@ foreach ($rrd_list as $i => $rrd)
 
   $rrd_options .= " DEF:".$rrd['ds'].$i."=".$rrd['filename'].":".$rrd['ds'].":AVERAGE ";
 
-  if($simple_rrd || $basicrrd)
+  if($simple_rrd)
   {
     $rrd_options .= " CDEF:".$rrd['ds'].$i."min=".$rrd['ds'].$i." ";
     $rrd_options .= " CDEF:".$rrd['ds'].$i."max=".$rrd['ds'].$i." ";