diff --git a/plugins/cacti/cacti-host b/plugins/cacti/cacti-host
index 2a90638f..47dd464e 100755
--- a/plugins/cacti/cacti-host
+++ b/plugins/cacti/cacti-host
@@ -21,7 +21,7 @@ if [[ $1 != "" ]]; then
         echo "graph_title Servidores consultados"
         echo "graph_vlabel Numero servidores (s)"
         echo "poller_hosts.label hosts(s)"
-        echo 'graph_category cacti'
+        echo 'graph_category munin'
         exit 0
     fi
 fi
diff --git a/plugins/cacti/cacti_poller_time b/plugins/cacti/cacti_poller_time
index 8c6cc8d0..f843ea04 100755
--- a/plugins/cacti/cacti_poller_time
+++ b/plugins/cacti/cacti_poller_time
@@ -21,7 +21,7 @@ if [[ $1 != "" ]]; then
         echo "graph_title Poller Time"
         echo "graph_vlabel Time(s)"
         echo "poller_time.label time(s)"
-        echo 'graph_category cacti'
+        echo 'graph_category munin'
         exit 0
     fi
 fi
diff --git a/plugins/cacti/cacti_rrds b/plugins/cacti/cacti_rrds
index d8aba858..efa83616 100755
--- a/plugins/cacti/cacti_rrds
+++ b/plugins/cacti/cacti_rrds
@@ -21,7 +21,7 @@ if [[ $1 != "" ]]; then
         echo "graph_title RRDs Procesados Time"
         echo "graph_vlabel Numero de RRDs"
         echo "rrds.label rrds"
-        echo 'graph_category cacti'
+        echo 'graph_category munin'
         exit 0
     fi
 fi
diff --git a/plugins/dxtv/hadoop-under_replicated-blocks b/plugins/hdfs/hadoop-under_replicated-blocks
similarity index 100%
rename from plugins/dxtv/hadoop-under_replicated-blocks
rename to plugins/hdfs/hadoop-under_replicated-blocks
diff --git a/plugins/netapp/snmp__netapp_cifs b/plugins/netapp/snmp__netapp_cifs
index 0b1eafc4..75e7365a 100755
--- a/plugins/netapp/snmp__netapp_cifs
+++ b/plugins/netapp/snmp__netapp_cifs
@@ -33,7 +33,7 @@ if len(sys.argv) == 2 and sys.argv[1]  == "config":
     print 'graph_title CIFS usage on '+servername
     print 'graph_args --base 1000 -l 0'
     print 'graph_vlabel number'
-    print 'graph_category san'
+    print 'graph_category fs'
     print 'graph_info This graph shows CIFS usage on '+servername 
 
     print 'cifsConnectedUsers.label ConnectedUsers'
diff --git a/plugins/netapp/snmp__netapp_cifs2 b/plugins/netapp/snmp__netapp_cifs2
index 52d52836..40814761 100755
--- a/plugins/netapp/snmp__netapp_cifs2
+++ b/plugins/netapp/snmp__netapp_cifs2
@@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CIFS sessions\n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel CIFS\n";
-    print "graph_category san\n";
+    print "graph_category fs\n";
     print "graph_info This graph shows CIFS sessions status for the $host.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/netapp/snmp__netapp_cifscalls b/plugins/netapp/snmp__netapp_cifscalls
index 88860e95..5ff673d3 100755
--- a/plugins/netapp/snmp__netapp_cifscalls
+++ b/plugins/netapp/snmp__netapp_cifscalls
@@ -91,7 +91,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CIFS calls\n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel calls / \${graph_period}\n";
-    print "graph_category san\n";
+    print "graph_category fs\n";
     print "graph_info This graph shows cifs calls for the $host NetApp equipment.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/netapp/snmp__netapp_cpu b/plugins/netapp/snmp__netapp_cpu
index e850a958..ea56b09b 100755
--- a/plugins/netapp/snmp__netapp_cpu
+++ b/plugins/netapp/snmp__netapp_cpu
@@ -34,7 +34,7 @@ if len(sys.argv) == 2 and sys.argv[1]  == "config":
     print 'graph_scale no'
     print 'graph_info This graph shows how CPU time is spent.'
     print 'graph_period second'
-    print 'graph_category san'
+    print 'graph_category cpu'
 
     print 'usage.label cpu_usage '
     print 'usage.draw STACK'
diff --git a/plugins/netapp/snmp__netapp_cpu2 b/plugins/netapp/snmp__netapp_cpu2
index d5855526..651a2077 100755
--- a/plugins/netapp/snmp__netapp_cpu2
+++ b/plugins/netapp/snmp__netapp_cpu2
@@ -93,7 +93,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host CPU \n";
     print "graph_args --base 1000 -r --lower-limit 0 --upper-limit 100\n";
     print "graph_vlabel CPU \n";
-    print "graph_category san\n";
+    print "graph_category cpu\n";
     print "graph_info This graph shows cpu busy value for the $host in percent.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/netapp/snmp__netapp_ndmp b/plugins/netapp/snmp__netapp_ndmp
index c8e2899f..e37b28b4 100755
--- a/plugins/netapp/snmp__netapp_ndmp
+++ b/plugins/netapp/snmp__netapp_ndmp
@@ -84,7 +84,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host NDMP \n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel NDMP status\n";
-    print "graph_category san\n";
+    print "graph_category backup\n";
     print "graph_info This graph shows NDMP status for the $host NetApp equipment.\n";
     print "graph_order ";
     foreach (sort keys %oids)
diff --git a/plugins/netapp/snmp__netapp_nfs3calls b/plugins/netapp/snmp__netapp_nfs3calls
index ab897ae3..44acdb21 100755
--- a/plugins/netapp/snmp__netapp_nfs3calls
+++ b/plugins/netapp/snmp__netapp_nfs3calls
@@ -121,7 +121,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config") {
     print "graph_args --base 1000\n";
     print "graph_vlabel calls / \${graph_period}\n";
     # graph_category san # To show plugin in Gallery also in this category
-    print "graph_category nfs\n";
+    print "graph_category fs\n";
     print "graph_info This graph shows NFSv3 calls for the $host NetApp equipment.\n";
     print "graph_order ";
 
diff --git a/plugins/netapp/snmp__netapp_ops b/plugins/netapp/snmp__netapp_ops
index 141bf6b0..a443749d 100755
--- a/plugins/netapp/snmp__netapp_ops
+++ b/plugins/netapp/snmp__netapp_ops
@@ -85,7 +85,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
     print "graph_title $host OPS \n";
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel OPS \n";
-    print "graph_category san\n";
+    print "graph_category fs\n";
     print "graph_info This graph shows OPS for the $host NetApp equipment.\n";
     print "graph_order misc64CifsOps misc64NfsOps iscsi64Ops fcp64Ops misc64HttpOps\n";
     foreach my $k (sort keys %config)
diff --git a/plugins/netapp/snmp__netapp_reallocate b/plugins/netapp/snmp__netapp_reallocate
index 92b0780b..b68abc6d 100755
--- a/plugins/netapp/snmp__netapp_reallocate
+++ b/plugins/netapp/snmp__netapp_reallocate
@@ -112,7 +112,7 @@ sub do_config_vol
     }
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel reallocate_status status\n";
-    print "graph_category san\n";
+    print "graph_category fs\n";
     foreach my $state ("reallocating", "redirecting", "quiesce", "debug")
     {
         print "$state.label $state\n";
diff --git a/plugins/netapp/snmp__netapp_sis b/plugins/netapp/snmp__netapp_sis
index 4c0cf48b..640c2f39 100755
--- a/plugins/netapp/snmp__netapp_sis
+++ b/plugins/netapp/snmp__netapp_sis
@@ -110,7 +110,7 @@ sub do_config_vol
     }
     print "graph_args --base 1000 --lower-limit 0 --rigid\n";
     print "graph_vlabel sis status\n";
-    print "graph_category san\n";
+    print "graph_category fs\n";
     print "graph_order sisInitialising sisRunning sisPending sisDebug\n";
     foreach my $state ("debug", "initialising", "running", "pending")
     {
diff --git a/plugins/nfs-freebsd/nfs_client b/plugins/nfs-freebsd/nfs_client
index 197c3d86..312fb6f2 100644
--- a/plugins/nfs-freebsd/nfs_client
+++ b/plugins/nfs-freebsd/nfs_client
@@ -48,7 +48,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000 -l 0'
     echo 'graph_vlabel requests / ${graph_period}'
     echo 'graph_total total'
-    echo 'graph_category NFS'
+    echo 'graph_category fs'
     for a in $labels; do echo "$a.label $a" ; echo "$a.type DERIVE"; echo "$a.min 0"; done
     exit 0
 fi
diff --git a/plugins/nfs-freebsd/nfs_client_cache b/plugins/nfs-freebsd/nfs_client_cache
index c29043b0..9c5d3441 100644
--- a/plugins/nfs-freebsd/nfs_client_cache
+++ b/plugins/nfs-freebsd/nfs_client_cache
@@ -48,7 +48,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000 -l 0'
     echo 'graph_vlabel requests / ${graph_period}'
     echo 'graph_total total'
-    echo 'graph_category NFS'
+    echo 'graph_category fs'
     for a in $labels; do echo "$a.label $a" ; echo "$a.type DERIVE"; echo "$a.min 0"; done
     exit 0
 fi
diff --git a/plugins/nfs-freebsd/nfsd b/plugins/nfs-freebsd/nfsd
index 344679ac..d551b844 100755
--- a/plugins/nfs-freebsd/nfsd
+++ b/plugins/nfs-freebsd/nfsd
@@ -50,7 +50,7 @@ if [ "$1" = "config" ]; then
     echo 'graph_args --base 1000 -l 0'
     echo 'graph_vlabel requests / ${graph_period}'
     echo 'graph_total total'
-    echo 'graph_category NFS'
+    echo 'graph_category fs'
     for a in $labels; do echo "$a.label $a" ; echo "$a.type DERIVE"; echo "$a.min 0"; done
     exit 0
 fi