diff --git a/plugins/disk/xfs b/plugins/disk/xfs
index 02fc827b..7f32746c 100755
--- a/plugins/disk/xfs
+++ b/plugins/disk/xfs
@@ -100,7 +100,7 @@ foreach my $func ( keys %config ) {
     print "graph_title $config{$func}->{title}\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel $config{$func}->{vtitle}\n";
-    print "graph_category filesystem\n";
+    print "graph_category disk\n";
     my $iter = 0;
     foreach my $param (@{$config{$func}->{params}}) {
       print "$param.type DERIVE\n";
diff --git a/plugins/disk/xfs_frag b/plugins/disk/xfs_frag
index 8c67ac4c..7218934a 100755
--- a/plugins/disk/xfs_frag
+++ b/plugins/disk/xfs_frag
@@ -40,7 +40,7 @@ case $1 in
 		cat <<'EOF'	
 graph_title XFS fragmentation
 graph_vlabel Percent
-graph_category filesystem 
+graph_category disk
 EOF
 		cat /etc/mtab | awk '{print $2 " " $3}' | while read LINE
 		do
diff --git a/plugins/zfs/zfs-filesystem-graph b/plugins/zfs/zfs-filesystem-graph
index 7a3d1c3d..857352f6 100755
--- a/plugins/zfs/zfs-filesystem-graph
+++ b/plugins/zfs/zfs-filesystem-graph
@@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then
 graph_order usedbydataset usedbychildren usedbysnapshots usedbyrefreservation available total quota
 graph_args --base 1024 -r -l 0 --vertical-label Bytes
 graph_info This graph shows how is used a zfs filesystems.
-graph_category filesystem
+graph_category disk
 graph_period second
 usedbydataset.label UsedByDataset
 usedbydataset.draw AREA
diff --git a/plugins/zfs/zfs-stats-for-freebsd-arc-efficiency b/plugins/zfs/zfs-stats-for-freebsd-arc-efficiency
index c14c895b..b70caa9e 100755
--- a/plugins/zfs/zfs-stats-for-freebsd-arc-efficiency
+++ b/plugins/zfs/zfs-stats-for-freebsd-arc-efficiency
@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Efficiency'
     echo 'graph_args -l 0'
     echo 'graph_vlabel %'
-    echo 'graph_category filesystem'
+    echo 'graph_category disk'
     echo 'graph_info This graph shows the ARC Efficiency'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /Efficiency/ {print}' | \
diff --git a/plugins/zfs/zfs-stats-for-freebsd-arc-utilization b/plugins/zfs/zfs-stats-for-freebsd-arc-utilization
index 87a64a03..2b1d7cce 100755
--- a/plugins/zfs/zfs-stats-for-freebsd-arc-utilization
+++ b/plugins/zfs/zfs-stats-for-freebsd-arc-utilization
@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Size'
     echo 'graph_args -l 0'
     echo 'graph_vlabel Size in MB'
-    echo 'graph_category filesystem'
+    echo 'graph_category disk'
     echo 'graph_info This graph shows the ARC Size utilization'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /^ARC Size/ {print}' | \
diff --git a/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list
index 0273d3f3..1e1e90a3 100755
--- a/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list
+++ b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-cache-list
@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Cache Hits by Cache List'
     echo 'graph_args  -l 0'
     echo 'graph_vlabel %'
-    echo 'graph_category filesystem'
+    echo 'graph_category disk'
     echo 'graph_info This graph shows the ARC cache hits by cache list'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /CACHE HITS BY CACHE LIST/ {print}' | \
diff --git a/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type
index 4dd0b923..7d3386ef 100755
--- a/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type
+++ b/plugins/zfs/zfs-stats-for-freebsd-cache-hits-by-data-type
@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS ARC Cache Hits and Misses'
     echo 'graph_args --upper-limit 100 -l -100'
     echo 'graph_vlabel %'
-    echo 'graph_category filesystem'
+    echo 'graph_category disk'
     echo 'graph_info This graph shows the ARC cache hits and misses by data type'
 
 /usr/local/bin/zfs-stats -A | awk 'BEGIN { RS = "" ; FS = "\n" } /HITS BY DATA TYPE/ {print}' | \
diff --git a/plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch b/plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch
index f089e966..8c98956b 100755
--- a/plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch
+++ b/plugins/zfs/zfs-stats-for-freebsd-dmu-prefetch
@@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_title ZFS DMU prefech stats'
     echo 'graph_args --upper-limit 100 -l -100'
     echo 'graph_vlabel %'
-    echo 'graph_category filesystem'
+    echo 'graph_category disk'
     echo 'graph_info This graph shows the DMU prefech stats'
 
 /usr/local/bin/zfs-stats -Z | awk '/Hit Ratio/ {sub(/[\t ]*/,"");sub(/:.*/,""); displayname = $0; gsub(/[ .]/,"_",$0); print $0".label "displayname"\n"$0".min 0"}' 
diff --git a/plugins/zfs/zfs_cache_efficiency b/plugins/zfs/zfs_cache_efficiency
index 53d1ba21..bd1a30d1 100755
--- a/plugins/zfs/zfs_cache_efficiency
+++ b/plugins/zfs/zfs_cache_efficiency
@@ -15,7 +15,7 @@ case $1 in
 graph_title ZFS ARC efficiency
 graph_vlabel %
 graph_scale no
-graph_category filesystem 
+graph_category disk
 graph_args -l 0 
 graph_info FreeBSD ZFS ARC Utilisation - Counters
 graph_period minute
diff --git a/plugins/zfs/zfs_list b/plugins/zfs/zfs_list
index e8c7ed38..f88519fe 100755
--- a/plugins/zfs/zfs_list
+++ b/plugins/zfs/zfs_list
@@ -38,7 +38,7 @@ graph_title $fsname usage
 graph_order usedbydataset usedbychildren usedbysnapshots usedbyrefreservation available total quota
 graph_args --base 1024 -r -l 0 --vertical-label Bytes --upper-limit ${values[6]}
 graph_info This graph shows how is used a zfs filesystems.
-graph_category filesystem
+graph_category disk
 graph_period second
 usedbydataset.label UsedByDataset
 usedbydataset.draw AREA
diff --git a/plugins/zfs/zfs_stats_ b/plugins/zfs/zfs_stats_
index 6c3fb116..fb56f81d 100755
--- a/plugins/zfs/zfs_stats_
+++ b/plugins/zfs/zfs_stats_
@@ -272,7 +272,7 @@ l2efficiency() {
 
 }
 
-[ "$1" = "config" ] && echo "graph_category filesystem"
+[ "$1" = "config" ] && echo "graph_category disk"
 
 case "$FUNCTION" in
         efficiency)
diff --git a/plugins/zfs/zfs_usage_ b/plugins/zfs/zfs_usage_
index 86ae6fb2..5a1fbfad 100755
--- a/plugins/zfs/zfs_usage_
+++ b/plugins/zfs/zfs_usage_
@@ -183,7 +183,7 @@ sub do_config_fs {
     }
     print "graph_args --base 1024 --lower-limit 0 --rigid\n";
     print "graph_vlabel bytes \n";
-    print "graph_category filesystem\n";
+    print "graph_category disk\n";
     print "graph_order @order\n";
 
     foreach my $key ( keys %{$filesystems->{$fs}}) {
diff --git a/plugins/zfs/zfsarcstats-counters b/plugins/zfs/zfsarcstats-counters
index d47a6862..8285e05c 100755
--- a/plugins/zfs/zfsarcstats-counters
+++ b/plugins/zfs/zfsarcstats-counters
@@ -13,7 +13,7 @@ case $1 in
 graph_title ZFS ARC Counters
 graph_vlabel per second
 graph_scale no
-graph_category filesystem 
+graph_category disk
 graph_args -l 0
 graph_info FreeBSD ZFS ARC Utilisation - Counters
 EOF
diff --git a/plugins/zfs/zfsonlinux_stats_ b/plugins/zfs/zfsonlinux_stats_
index b0bd8b42..276b7ae5 100755
--- a/plugins/zfs/zfsonlinux_stats_
+++ b/plugins/zfs/zfsonlinux_stats_
@@ -328,7 +328,7 @@ l2efficiency() {
 
 }
 
-[ "$1" = "config" ] && echo "graph_category filesystem"
+[ "$1" = "config" ] && echo "graph_category disk"
 
 case "$FUNCTION" in
         efficiency)
diff --git a/plugins/zfs/zlist b/plugins/zfs/zlist
index 3892f683..229917e2 100755
--- a/plugins/zfs/zlist
+++ b/plugins/zfs/zlist
@@ -4,7 +4,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title zpool list'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel zpool list'
-        echo 'graph_category filesystem'
+        echo 'graph_category disk'
         echo 'graph_scale no'
         echo 'graph_info This graph shows zpool list on the server.'
 	zlist=`/sbin/zpool list -H|awk '{print $1}'`
diff --git a/plugins/zfs/zpool_iostat b/plugins/zfs/zpool_iostat
index a2e2c22a..51b2b1f9 100755
--- a/plugins/zfs/zpool_iostat
+++ b/plugins/zfs/zpool_iostat
@@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then
         echo 'graph_title zpool iostat'
         echo 'graph_args --base 1000 -l 0'
         echo 'graph_vlabel write - read KBytes/s'
-        echo 'graph_category filesystem'
+        echo 'graph_category disk'
         echo 'graph_scale no'
         echo 'graph_info This graph shows zpool iostat'
 	echo 'graph_order '$zorder