diff --git a/plugins/mysql/hs_read b/plugins/mysql/hs_read
index 2468f056..ae3e093e 100644
--- a/plugins/mysql/hs_read
+++ b/plugins/mysql/hs_read
@@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then
 
     echo 'graph_title HS Read port connections'
     echo "graph_args --base 1000 -l 0"
-    echo 'graph_category mysql'
+    echo 'graph_category db'
     echo 'total.label Total'
     echo 'total.draw AREA'
     echo 'total.min 0'
diff --git a/plugins/mysql/hs_write b/plugins/mysql/hs_write
index 5442a4d4..6ab14b6f 100644
--- a/plugins/mysql/hs_write
+++ b/plugins/mysql/hs_write
@@ -41,7 +41,7 @@ if [ "$1" = "config" ]; then
 
     echo 'graph_title HS Write port connections'
     echo "graph_args --base 1000 -l 0"
-    echo 'graph_category mysql'
+    echo 'graph_category db'
     echo 'total.label Total'
     echo 'total.draw AREA'
     echo 'total.min 0'
diff --git a/plugins/mysql/mysql-schema-size b/plugins/mysql/mysql-schema-size
index f25c9872..d1227479 100755
--- a/plugins/mysql/mysql-schema-size
+++ b/plugins/mysql/mysql-schema-size
@@ -28,7 +28,7 @@ while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
 if($argc > 1 && $argv[1] == 'config') {
   $text = <<<EOT
 graph_title $dbname Schema Size
-graph_category mysql
+graph_category db
 graph_vlabel Size
 graph_args --base 1024 -l 0
 $text
diff --git a/plugins/mysql/mysql-table-size b/plugins/mysql/mysql-table-size
index 9dc2cda8..465be1c9 100755
--- a/plugins/mysql/mysql-table-size
+++ b/plugins/mysql/mysql-table-size
@@ -30,7 +30,7 @@ EOT;
 if($argc > 1 && $argv[1] == 'config') {
   $text = <<<EOT
 graph_title $dbname Table Data Size
-graph_category mysql
+graph_category db
 graph_vlabel Size
 graph_args --base 1024 -l 0
 $text
diff --git a/plugins/mysql/mysql_aggregate_ b/plugins/mysql/mysql_aggregate_
index 9895eae4..8fcb8072 100755
--- a/plugins/mysql/mysql_aggregate_
+++ b/plugins/mysql/mysql_aggregate_
@@ -161,7 +161,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
         print "graph mysql_aggregate_%s" % table
         print "graph_title %s" % label
         print "graph_vlabel %s" % vlabel
-        print "graph_category mysql"
+        print "graph_category db"
         print ""
         if "only" in os.environ:
             print "values_count.label %s" % (os.environ["only"], )
@@ -171,7 +171,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
         print "multigraph mysql_aggregate_%s" % table
         print "graph_title %s" % label
         print "graph_vlabel %s" % vlabel
-        print "graph_category mysql"
+        print "graph_category db"
         print ""
 
         for key in values.keys():
@@ -182,7 +182,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
             print "multigraph mysql_aggregate_%s.%s" % (table, key.replace(".", "_"))
             print "graph_title %s, value %s" % (label, key.replace(".", "_"))
             print "graph_vlabel %s" % vlabel
-            print "graph_category mysql"
+            print "graph_category db"
             print ""
             print "%s_count.label %s" % (key.replace(".", "_"), key)
             print ""
diff --git a/plugins/mysql/mysql_connections b/plugins/mysql/mysql_connections
index 8ba9ee2b..5f779760 100755
--- a/plugins/mysql/mysql_connections
+++ b/plugins/mysql/mysql_connections
@@ -102,7 +102,7 @@ graph_title MySQL Connections
 graph_args --base 1000 --lower-limit 0
 graph_vlabel Connections
 graph_info The number of current connections with respect to the max_connections setting.
-graph_category mysql
+graph_category db
 graph_order current available
 graph_total Total
 current.label In Use
diff --git a/plugins/mysql/mysql_connections_per_user b/plugins/mysql/mysql_connections_per_user
index 28552d4b..db09d326 100755
--- a/plugins/mysql/mysql_connections_per_user
+++ b/plugins/mysql/mysql_connections_per_user
@@ -115,7 +115,7 @@ graph_title MySQL Connections per user
 graph_args --base 1000 --lower-limit 0
 graph_vlabel Connections
 graph_info The number of current connexions per user.
-graph_category mysql
+graph_category db
 graph_total Total
 EOM
 
diff --git a/plugins/mysql/mysql_qcache b/plugins/mysql/mysql_qcache
index b0744369..605adf9b 100755
--- a/plugins/mysql/mysql_qcache
+++ b/plugins/mysql/mysql_qcache
@@ -79,7 +79,7 @@ sub print_config {
     print('graph_title MySQL Queries in cache
 graph_args --base 1000
 graph_vlabel queries
-graph_category mysql
+graph_category db
 graph_info Plugin available at <a href="http://rodolphe.quiedeville.org/hack/munin/">http://rodolphe.quiedeville.org/hack/munin/</a>
 ');
 
diff --git a/plugins/mysql/mysql_qcache_mem b/plugins/mysql/mysql_qcache_mem
index 0fe06c31..cd5ec1d2 100755
--- a/plugins/mysql/mysql_qcache_mem
+++ b/plugins/mysql/mysql_qcache_mem
@@ -92,7 +92,7 @@ sub print_config {
     print('graph_title MySQL Queries Cache Size
 graph_args --base 1024 -l 0
 graph_vlabel bytes
-graph_category mysql
+graph_category db
 graph_order used free
 graph_total Total
 graph_info Plugin available at <a href="http://rodolphe.quiedeville.org/hack/munin/">http://rodolphe.quiedeville.org/hack/munin/</a>
diff --git a/plugins/mysql/mysql_report b/plugins/mysql/mysql_report
index 8ae0e02c..e8bf94fa 100755
--- a/plugins/mysql/mysql_report
+++ b/plugins/mysql/mysql_report
@@ -54,7 +54,6 @@ mysqlbin=$(which mysql)
 
 default_errorvalue=30
 default_title="Results from MySQL queries"
-default_category="mysql"
 default_vlabel="value / sec"
 default_info="This graph shows results of one or more SQL queries."
 default_args="--base 1000 -l 0"
@@ -77,7 +76,6 @@ fi
 
 [ -n "${errorvalue}" ] || errorvalue=${default_errorvalue}
 [ -n "${title}" ] || title="${default_title}"
-[ -n "${category}" ] || category="${default_category}"
 [ -n "${vlabel}" ] || vlabel="${default_vlabel}"
 [ -n "${info}" ] || info="${default_info}"
 [ -n "${args}" ] || args="${default_args}"
@@ -89,7 +87,7 @@ graph_title ${title}
 graph_args ${args}
 graph_scale ${scale}
 graph_vlabel ${vlabel}
-graph_category ${category}
+graph_category db
 graph_info ${info}
 EOH1
   [ -n "${period}" ] && echo "graph_period ${period}"
diff --git a/plugins/mysql/mysql_size_ b/plugins/mysql/mysql_size_
index 1199fcf9..1b96107f 100755
--- a/plugins/mysql/mysql_size_
+++ b/plugins/mysql/mysql_size_
@@ -115,7 +115,7 @@ sub print_config {
     print("graph_title MySQL database $db size\n");
     print ('graph_args --base 1024 -l 0
 graph_vlabel bytes
-graph_category mysql
+graph_category db
 graph_info Plugin available at <a href="http://rodolphe.quiedeville.org/hack/munin/">http://rodolphe.quiedeville.org/hack/munin/</a>
 ');
 
diff --git a/plugins/mysql/mysql_size_all b/plugins/mysql/mysql_size_all
index e22645d2..c6f617b9 100755
--- a/plugins/mysql/mysql_size_all
+++ b/plugins/mysql/mysql_size_all
@@ -126,7 +126,7 @@ sub print_config {
     print("graph_title MySQL databases size\n");
     print ('graph_args --base 1024 -l 0
 graph_vlabel bytes
-graph_category mysql
+graph_category db
 graph_info Plugin available at <a href="http://rodolphe.quiedeville.org/hack/munin/">http://rodolphe.quiedeville.org/hack/munin/</a>
 ');
 
diff --git a/plugins/mysql/mysql_size_ondisk b/plugins/mysql/mysql_size_ondisk
index c18b9a38..1045b04a 100755
--- a/plugins/mysql/mysql_size_ondisk
+++ b/plugins/mysql/mysql_size_ondisk
@@ -50,7 +50,7 @@ then
 elif [ "${1:-}" = "config" ]
 then
 	echo "graph_title MySQL on-disk database size"
-	echo "graph_category mysql"
+	echo "graph_category db"
 	# graph_info cannot have newlines - replace by <br> which will be rendered to newlines in
 	# the web interface.
 	echo "graph_info ${INFO//$'\n'/<br>}"
diff --git a/plugins/mysql/mysql_slave b/plugins/mysql/mysql_slave
index e4cef7e3..600ade22 100755
--- a/plugins/mysql/mysql_slave
+++ b/plugins/mysql/mysql_slave
@@ -79,7 +79,7 @@ sub print_config {
   print "graph_title MySQL Slave Status\n";
   print "graph_args --base 1000 -l 0\n";
   print "graph_vlabel Seconds\n";
-  print "graph_category mysql\n";
+  print "graph_category db\n";
   print "seconds.label Seconds behind master\n";
   print "seconds.min 0\n";
   print "seconds.draw LINE2\n";
diff --git a/plugins/mysql/mysql_slave_threads b/plugins/mysql/mysql_slave_threads
index abd9ac6b..f09f97af 100755
--- a/plugins/mysql/mysql_slave_threads
+++ b/plugins/mysql/mysql_slave_threads
@@ -28,7 +28,7 @@ if(defined $ARGV[0] && $ARGV[0] eq 'config') {
     print <<EOC
 graph_title MySQL Slave Threads
 graph_vlabel Running
-graph_category mysql
+graph_category db
 graph_args -l 0
 io.label I/O Thread
 io.critical 1:1
diff --git a/plugins/percona/percona_ b/plugins/percona/percona_
index f06f6e5a..3340b468 100644
--- a/plugins/percona/percona_
+++ b/plugins/percona/percona_
@@ -128,7 +128,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
 
     print "graph_title %s" % label
     print "graph_vlabel %s" % vlabel
-    print "graph_category percona"
+    print "graph_category db"
     print ""
 
     try:
diff --git a/plugins/snmp/snmp__rms2_ b/plugins/snmp/snmp__rms2_
index db369752..66309be6 100755
--- a/plugins/snmp/snmp__rms2_
+++ b/plugins/snmp/snmp__rms2_
@@ -185,7 +185,7 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
   print("host_name $host\n");
   printf("graph_title %s\n", $graphs->{$mode}->{'title'});
   # print "graph_args --base 1000\n";
-  print("graph_category envsensor\n");
+  print("graph_category sensors\n");
   printf("graph_vlabel %s\n", $graphs->{$mode}->{'unit'});
   unless (defined($graphs->{$mode}->{'thatype'})) {
     print("graph_info For contact sensors, the values mean: 1 = open, 2 = closed, 3 = armed, 4 = triggered\n");