diff --git a/plugins/docker/docker_cpu b/plugins/docker/docker_cpu
index 63165a11..e25b7e95 100755
--- a/plugins/docker/docker_cpu
+++ b/plugins/docker/docker_cpu
@@ -95,7 +95,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
    print "graph_vlabel %\n";
    print "graph_scale no\n";
    print "graph_period second\n";
-   print "graph_category Docker\n";
+   print "graph_category virtualization\n";
    print "graph_info This graph shows docker container CPU usage.\n";
    
    foreach(@result)
diff --git a/plugins/docker/docker_memory b/plugins/docker/docker_memory
index 1d848043..6e43c0b7 100755
--- a/plugins/docker/docker_memory
+++ b/plugins/docker/docker_memory
@@ -79,7 +79,7 @@ if (defined $ARGV[0] and $ARGV[0] eq "config")
    print "graph_title Docker container memory usage\n";
    print "graph_args --base 1024 -l 0\n";
    print "graph_vlabel Bytes\n";
-   print "graph_category Docker\n";
+   print "graph_category virtualization\n";
    print "graph_info This graph shows docker container memory usage.\n";
    
    foreach(@result)
diff --git a/plugins/glassfish/glassfish_counters_ b/plugins/glassfish/glassfish_counters_
index d2189ae0..b962ec9e 100644
--- a/plugins/glassfish/glassfish_counters_
+++ b/plugins/glassfish/glassfish_counters_
@@ -66,7 +66,7 @@ case $1 in
                         /dotted-name/ { myself = $NF
                                 print "graph_title GlassFish", myself
                                 print "graph_vlabel count"
-                                print "graph_category glassfish"
+                                print "graph_category appserver"
                                 print "graph_info this shows available counters from", myself
                                 next
                                 }
diff --git a/plugins/google/google-rank b/plugins/google/google-rank
index b2888e3c..00cafdba 100755
--- a/plugins/google/google-rank
+++ b/plugins/google/google-rank
@@ -55,7 +55,7 @@ if [ "$1" = "config" ]; then
    iLoop=1
    echo 'graph_title Google page rank'
    echo 'graph_args --upper-limit 100 -l 0'
-   echo 'graph_category google'
+   echo 'graph_category search'
    echo 'graph_scale no'
    echo 'graph_info Google page rank for URLs & Words'
 
diff --git a/plugins/google/googlecode b/plugins/google/googlecode
index d0eaf3f4..02d24f5a 100755
--- a/plugins/google/googlecode
+++ b/plugins/google/googlecode
@@ -47,7 +47,7 @@ if [ "$1" = "config" ]; then
     echo "graph_title Number of downloads of $PROJECTNAME from Google Code "
     echo "graph_args --base 1000 --lower-limit 0"
     echo "graph_vlabel number of downloads"
-    echo "graph_category google"
+    echo "graph_category other"
     echo "graph_info This graph shows the number of downloads of $PROJECTNAME from Google Code."
     j=0
     for (( i = 1 ; i < $Nfiles ; i=i+5 ))
diff --git a/plugins/lxd/lxd_disk b/plugins/lxd/lxd_disk
index 04988bbc..7a58993a 100755
--- a/plugins/lxd/lxd_disk
+++ b/plugins/lxd/lxd_disk
@@ -35,7 +35,7 @@ if len(sys.argv) == 2 and sys.argv[1]=="config":
     print("graph_title LXD container disk usage")
     print("graph_args --base 1000 --lower-limit 0")
     print("graph_vlabel Bytes")
-    print("graph_category lxd")
+    print("graph_category virtualization")
     print("graph_info This shows the disk usage of storage in containers. Make sure to install pylxd in python3.")
     for name in c.container_list():
         info = c.container_info(name)
diff --git a/plugins/lxd/lxd_mem b/plugins/lxd/lxd_mem
index 6c797836..f81a767d 100755
--- a/plugins/lxd/lxd_mem
+++ b/plugins/lxd/lxd_mem
@@ -35,7 +35,7 @@ if len(sys.argv) == 2 and sys.argv[1]=="config":
     print("graph_title LXD container memory")
     print("graph_args --base 1024 --lower-limit 0")
     print("graph_vlabel Bytes")
-    print("graph_category lxd")
+    print("graph_category virtualization")
     print("graph_info This shows the memory usage of each container. Make sure to install pylxd in python3.")
     for name in c.container_list():
         print(name+".label "+name)
diff --git a/plugins/moblock/moblock_connections b/plugins/moblock/moblock_connections
index c6bcd26f..6f163e9c 100755
--- a/plugins/moblock/moblock_connections
+++ b/plugins/moblock/moblock_connections
@@ -32,7 +32,7 @@ def config
   puts "graph_args --base 1000 -r --lower-limit 0"
   puts "graph_title Moblock"
   puts "graph_vlabel Blocked Connections"
-  puts "graph_category moblock"
+  puts "graph_category fw"
   puts "graph_info This graph shows the number of connections blocked by Moblock"
 
   puts "blocked_in.label Blocked In"
diff --git a/plugins/network/fwbuilder_ b/plugins/network/fwbuilder_
index d955eea6..9a4bae98 100755
--- a/plugins/network/fwbuilder_
+++ b/plugins/network/fwbuilder_
@@ -87,7 +87,7 @@ if [ "$1" = "config" ]; then
         echo "graph_title $IP traffic"
         echo 'graph_args --base 1024'
         echo 'graph_vlabel bytes per ${graph_period}'
-	echo 'graph_category network'
+	echo 'graph_category fw'
         echo 'out.label sent'
         echo 'out.type DERIVE'
         echo 'out.min 0'
diff --git a/plugins/network/ipfwcnt_ b/plugins/network/ipfwcnt_
index fff98860..a54e2980 100755
--- a/plugins/network/ipfwcnt_
+++ b/plugins/network/ipfwcnt_
@@ -63,7 +63,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Ipfw rules counters $NAME"
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel bits / ${graph_period}'
-	echo 'graph_category network'
+	echo 'graph_category fw'
 	draw="AREA"
 	for rule in $rules; do
 		eval "label0=\$rule_${rule}_label"
diff --git a/plugins/network/ipfwnat_ b/plugins/network/ipfwnat_
index 79cd60d4..3708729e 100755
--- a/plugins/network/ipfwnat_
+++ b/plugins/network/ipfwnat_
@@ -57,7 +57,7 @@ if [ "$1" = "config" ]; then
 	echo 'graph_args --base 1000 -l 0'
 	echo 'graph_vlabel links count'
 	echo 'graph_noscale true'
-	echo 'graph_category network'
+	echo 'graph_category fw'
 
 	echo 'tcp.draw AREA'
 	echo 'tcp.label tcp'
diff --git a/plugins/postgresql/slony_ b/plugins/postgresql/slony_
index f1e725c6..0358833a 100755
--- a/plugins/postgresql/slony_
+++ b/plugins/postgresql/slony_
@@ -70,7 +70,7 @@ if ($ARGV[0] && $ARGV[0] eq "config") {
 graph_title Slony latency
 graph_args --base 1000
 graph_vlabel Latency in seconds
-graph_category PostgreSQL
+graph_category db
 graph_info Shows Slony latency
 EOF
 my $sql="select no_id,no_comment,pa_conninfo from $cluster.sl_node join $cluster.sl_path on (pa_server=no_id) where pa_client= $cluster.getlocalnodeid('$cluster'::name);";
diff --git a/plugins/printer/dell_5310n_health_ b/plugins/printer/dell_5310n_health_
index 5d401734..8494496c 100755
--- a/plugins/printer/dell_5310n_health_
+++ b/plugins/printer/dell_5310n_health_
@@ -12,7 +12,7 @@ if [ "$1" = "config" ]; then
         echo "graph_title dell 5310n health: $destination"
         echo 'graph_vlabel count'
 	echo 'graph_args --lower-limit 0'
-        echo 'graph_category printer'
+        echo 'graph_category printing'
 
 	echo "toner.label Toner (percent)"
 else
diff --git a/plugins/printer/dell_5310n_pages_ b/plugins/printer/dell_5310n_pages_
index 3c7fa382..59047f22 100755
--- a/plugins/printer/dell_5310n_pages_
+++ b/plugins/printer/dell_5310n_pages_
@@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then
         echo "graph_title dell 5310n pages: $destination"
         echo 'graph_vlabel count'
 	echo 'graph_args --lower-limit 0'
-        echo 'graph_category printer'
+        echo 'graph_category printing'
 
 	n=1
 	for t in $trays ;
diff --git a/plugins/printer/hp2600_count_ b/plugins/printer/hp2600_count_
index 00f10465..185db3de 100755
--- a/plugins/printer/hp2600_count_
+++ b/plugins/printer/hp2600_count_
@@ -31,7 +31,7 @@ case $1 in
 host_name printers
 graph_title HP 2600 pages by cartridge statistics
 graph_vlabel Count (Pages)
-graph_category printer
+graph_category printing
 graph_info Pages count by color.
 graph_args  -l 0 
 graph_scale no
diff --git a/plugins/printer/hp2600_status_ b/plugins/printer/hp2600_status_
index 1d1ed15c..dcb36a24 100755
--- a/plugins/printer/hp2600_status_
+++ b/plugins/printer/hp2600_status_
@@ -31,7 +31,7 @@ case $1 in
 host_name printers
 graph_title HP 2600 cartridge status 
 graph_vlabel Status (%)
-graph_category printer
+graph_category printing
 graph_info Toner status.
 graph_args --upper-limit 400 -l 0 
 line.label ---
diff --git a/plugins/printer/oki_c5500_health_ b/plugins/printer/oki_c5500_health_
index 59a7138c..5393fdc6 100755
--- a/plugins/printer/oki_c5500_health_
+++ b/plugins/printer/oki_c5500_health_
@@ -10,7 +10,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title oki c5500 health: $destination"
 	echo 'graph_vlabel percent'
 	echo 'graph_args --lower-limit 0 --upper-limit 100'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "tonerCyan.label Toner: Cyan"
 	echo "tonerMagenta.label Toner: Magenta"
diff --git a/plugins/printer/oki_c5500_pages_ b/plugins/printer/oki_c5500_pages_
index 75085545..5e8bbec8 100755
--- a/plugins/printer/oki_c5500_pages_
+++ b/plugins/printer/oki_c5500_pages_
@@ -10,7 +10,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title oki c5500 pages: $destination"
 	echo 'graph_vlabel count'
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "tray1.label Tray 1"
 	echo "tray2.label Tray 2"
diff --git a/plugins/printer/toshiba_5520c_byfunction_black_ b/plugins/printer/toshiba_5520c_byfunction_black_
index 7d8c8247..d20bb2ab 100755
--- a/plugins/printer/toshiba_5520c_byfunction_black_
+++ b/plugins/printer/toshiba_5520c_byfunction_black_
@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Toshiba 5520C: Black Pages (by function)"
 	echo 'graph_vlabel Pages'
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "blackPrintCopy.label Print: Copy"
 	echo "blackPrintCopy.draw AREA"
diff --git a/plugins/printer/toshiba_5520c_byfunction_fullcolor_ b/plugins/printer/toshiba_5520c_byfunction_fullcolor_
index b2cfa8f5..5a138be9 100755
--- a/plugins/printer/toshiba_5520c_byfunction_fullcolor_
+++ b/plugins/printer/toshiba_5520c_byfunction_fullcolor_
@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Toshiba 5520C: Full Color Pages (by function)"
 	echo 'graph_vlabel Pages'
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "fullColorPrintComputer.label Print from Computer"
 	echo "fullColorPrintComputer.draw AREA"
diff --git a/plugins/printer/toshiba_5520c_print_ b/plugins/printer/toshiba_5520c_print_
index 9814c5c0..c7d3d6b8 100755
--- a/plugins/printer/toshiba_5520c_print_
+++ b/plugins/printer/toshiba_5520c_print_
@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Toshiba 5520C: Pages Printed"
 	echo 'graph_vlabel Pages'
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "printBlack.label Black"
 	echo "printBlack.draw AREA"
diff --git a/plugins/printer/toshiba_5520c_scan_ b/plugins/printer/toshiba_5520c_scan_
index 829d0c55..c981c9d5 100755
--- a/plugins/printer/toshiba_5520c_scan_
+++ b/plugins/printer/toshiba_5520c_scan_
@@ -9,7 +9,7 @@ if [ "$1" = "config" ]; then
 	echo "graph_title Toshiba 5520C: Pages Scanned"
 	echo 'graph_vlabel Pages'
 	echo 'graph_args --lower-limit 0'
-	echo 'graph_category printer'
+	echo 'graph_category printing'
 
 	echo "scanFullColor.label Full Color"
 	echo "scanFullColor.draw AREA"
diff --git a/plugins/printer/xerox-wc3220 b/plugins/printer/xerox-wc3220
index 5645c1e7..dc695333 100755
--- a/plugins/printer/xerox-wc3220
+++ b/plugins/printer/xerox-wc3220
@@ -35,7 +35,7 @@ config)
 
 echo "graph_title Consumables level @ $PRINTER_IP"
 echo 'graph_vlabel %'
-echo 'graph_category printer'
+echo 'graph_category printing'
 echo 'graph_scale no'
 echo 'black.label Black toner level'
 echo 'black.draw LINE2'
diff --git a/plugins/printer/xerox-wc7232-consumables b/plugins/printer/xerox-wc7232-consumables
index 3f9417dc..d427da3f 100755
--- a/plugins/printer/xerox-wc7232-consumables
+++ b/plugins/printer/xerox-wc7232-consumables
@@ -35,7 +35,7 @@ config)
 
 echo "graph_title Consumables level @ $PRINTER_IP"
 echo 'graph_vlabel %'
-echo 'graph_category printer'
+echo 'graph_category printing'
 echo 'graph_scale no'
 echo 'cyan.label Cyan toner level'
 echo 'cyan.draw LINE2'
diff --git a/plugins/network/dns/tinydns b/plugins/tinydns/tinydns
similarity index 98%
rename from plugins/network/dns/tinydns
rename to plugins/tinydns/tinydns
index 5d620602..152fc5dc 100755
--- a/plugins/network/dns/tinydns
+++ b/plugins/tinydns/tinydns
@@ -26,7 +26,7 @@ if [ "$1" = "config" ]; then
 graph_title tinydns queries
 graph_args --base 1000 -l 0
 graph_vlabel queries/sec
-graph_category network
+graph_category dns
 graph_info This graph shows the number of queries that tinydns processed.
 graph_total Total
 a.label A
diff --git a/plugins/network/dns/tinydns_err b/plugins/tinydns/tinydns_err
similarity index 98%
rename from plugins/network/dns/tinydns_err
rename to plugins/tinydns/tinydns_err
index 29b864bc..2f57b768 100755
--- a/plugins/network/dns/tinydns_err
+++ b/plugins/tinydns/tinydns_err
@@ -26,7 +26,7 @@ if [ "$1" = "config" ]; then
 graph_title tinydns query errors
 graph_args --base 1000 -l 0
 graph_vlabel queries/sec   
-graph_category network
+graph_category dns
 graph_info This graph shows the number of queries that tinydns processed.
 graph_total Total
 other.label Other RR