diff --git a/plugins/apache/http-response-times b/plugins/apache/http-response-times
index 6c7ecab0..3f8b291b 100755
--- a/plugins/apache/http-response-times
+++ b/plugins/apache/http-response-times
@@ -53,7 +53,7 @@ if (! @urls) {
 #output configuration and exit - required by Munin
 if (exists $ARGV[0] and $ARGV[0] eq "config") {
     print "graph_title $domain Site Response Times - $ENV{'action'}\n"; 
-    print "graph_category apache\n";
+    print "graph_category webserver\n";
     print "graph_vlabel request time (seconds)\n";
     print "graph_info Response times for public areas of $domain.\n";
 
diff --git a/plugins/apache/page_load b/plugins/apache/page_load
index 19b169b5..cc09a885 100644
--- a/plugins/apache/page_load
+++ b/plugins/apache/page_load
@@ -43,7 +43,7 @@ do_ () {
 do_config () {
     echo "graph_title Average page execution time"
     echo "graph_vlabel Seconds"
-    echo "graph_category apache"
+    echo "graph_category webserver"
     echo "graph_args --base 1000 -l 0"
     echo "graph_info Average page execution time"
  
@@ -56,4 +56,4 @@ case $1 in
 	eval do_$1
 esac
  
-exit $?
\ No newline at end of file
+exit $?
diff --git a/plugins/other/assp-envelope-recipient-statistics b/plugins/mail/assp/assp-envelope-recipient-statistics
similarity index 99%
rename from plugins/other/assp-envelope-recipient-statistics
rename to plugins/mail/assp/assp-envelope-recipient-statistics
index 8f9f03cc..98366914 100755
--- a/plugins/other/assp-envelope-recipient-statistics
+++ b/plugins/mail/assp/assp-envelope-recipient-statistics
@@ -129,7 +129,7 @@ sub response_error{
 if( $ARGV[0] eq "config" ){
 	print "graph_title ASSP - Envelope Recipient Statistics\n";
 	print "graph_vlabel Counter in k,m\n";
-	print "graph_category ASSP\n";
+	print "graph_category spamfilter\n";
 
 	my $label;
 	foreach my $key ( @muninlabel ){
diff --git a/plugins/other/assp-general-runtime-information b/plugins/mail/assp/assp-general-runtime-information
similarity index 99%
rename from plugins/other/assp-general-runtime-information
rename to plugins/mail/assp/assp-general-runtime-information
index c7aebc9d..931b0ed9 100755
--- a/plugins/other/assp-general-runtime-information
+++ b/plugins/mail/assp/assp-general-runtime-information
@@ -113,7 +113,7 @@ if( $ARGV[0] eq "config" ){
 		if( $count == 0 ){	# General Runtime Information
 			print "graph_title ASSP - General Runtime Information\n";
 			print "graph_vlabel Counter in Percent\n";
-			print "graph_category ASSP\n";
+			print "graph_category spamfilter\n";
 		}
 		$label = $key;
 		$label =~ s/\s/\_/g;
diff --git a/plugins/other/assp-message-statistics b/plugins/mail/assp/assp-message-statistics
similarity index 99%
rename from plugins/other/assp-message-statistics
rename to plugins/mail/assp/assp-message-statistics
index e199fae7..0657dbd0 100755
--- a/plugins/other/assp-message-statistics
+++ b/plugins/mail/assp/assp-message-statistics
@@ -141,7 +141,7 @@ sub response_error{
 if( $ARGV[0] eq "config" ){
 	print "graph_title ASSP - Message Statistics\n";
 	print "graph_vlabel Counter in k,m\n";
-	print "graph_category ASSP\n";
+	print "graph_category spamfilter\n";
 
 	my $label;
 	foreach my $key ( @muninlabel ){
diff --git a/plugins/other/assp-smtp-connection-statistics b/plugins/mail/assp/assp-smtp-connection-statistics
similarity index 99%
rename from plugins/other/assp-smtp-connection-statistics
rename to plugins/mail/assp/assp-smtp-connection-statistics
index cb9487b7..4caabb9f 100755
--- a/plugins/other/assp-smtp-connection-statistics
+++ b/plugins/mail/assp/assp-smtp-connection-statistics
@@ -119,7 +119,7 @@ sub response_error{
 if( $ARGV[0] eq "config" ){
 	print "graph_title ASSP - SMTP Connection Statistics\n";
 	print "graph_vlabel Counter in k,m\n";
-	print "graph_category ASSP\n";
+	print "graph_category spamfilter\n";
 
 	my $label;
 	foreach my $key ( @muninlabel ){
diff --git a/plugins/other/assp-smtp-handler-statistics b/plugins/mail/assp/assp-smtp-handler-statistics
similarity index 99%
rename from plugins/other/assp-smtp-handler-statistics
rename to plugins/mail/assp/assp-smtp-handler-statistics
index 596e8469..c43570f6 100755
--- a/plugins/other/assp-smtp-handler-statistics
+++ b/plugins/mail/assp/assp-smtp-handler-statistics
@@ -113,7 +113,7 @@ if( $ARGV[0] eq "config" ){
 		if( $count == 0 ){	# General Runtime Information
 			print "graph_title ASSP - General Runtime Information\n";
 			print "graph_vlabel Counter in Percent\n";
-			print "graph_category ASSP\n";
+			print "graph_category spamfilter\n";
 		}
 		$label = $key;
 		$label =~ s/\s/\_/g;
diff --git a/plugins/minecraft/minecraft-users-ram_ b/plugins/minecraft/minecraft-users-ram_
index 3bef3c05..9db52074 100644
--- a/plugins/minecraft/minecraft-users-ram_
+++ b/plugins/minecraft/minecraft-users-ram_
@@ -8,7 +8,7 @@ MC_PORT=${0##*_}
 if [ "$1" = "config" ]
 then
     printf 'graph_title Minecraft-Server (Port %s)\n' ${MC_PORT}
-    printf 'graph_catecory games'
+    printf 'graph_category games'
     printf 'graph_vlabel Anzahl\n'
     printf 'users.label Benutzer\n'
     printf 'ramusage.label Verwendeter RAM in GiB\n'
diff --git a/plugins/nginx/nginx-cache-hit-rate b/plugins/nginx/nginx-cache-hit-rate
index a241a8c4..ade87fe7 100755
--- a/plugins/nginx/nginx-cache-hit-rate
+++ b/plugins/nginx/nginx-cache-hit-rate
@@ -57,7 +57,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "autoconf" ) {
 if ( exists $ARGV[0] and $ARGV[0] eq "config" ) {
     print "graph_title NGINX hit rates\n";
     print "graph_args -l 0 -u 100 --rigid\n";
-    print "graph_category nginx\n";
+    print "graph_category webserver\n";
     print "graph_vlabel %\n";
     print "hit.label Hits\n";
     print "hit.draw AREA\n";
diff --git a/plugins/nginx/nginx-cache-multi_ b/plugins/nginx/nginx-cache-multi_
index 3ab8046b..05245ffc 100755
--- a/plugins/nginx/nginx-cache-multi_
+++ b/plugins/nginx/nginx-cache-multi_
@@ -64,7 +64,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
     # Parent graph declaration
     print "multigraph nginx_cache_multi_%s" % graph_type
     print "graph_title Nginx cache status (%s)" % graph_type
-    print "graph_category nginx"
+    print "graph_category webserver"
     print "graph_vlabel %s" % vlabel
     if graph_args:
          print(graph_args)
@@ -80,7 +80,7 @@ elif len(sys.argv) == 2 and sys.argv[1] == "config":
         if key != "TOTAL":
             print "multigraph nginx_cache_multi_%s.%s" % (graph_type, key.lower())
             print "graph_title Nginx cache status (%s) - %s" % (graph_type, key.capitalize())
-            print "graph_category nginx"
+            print "graph_category webserver"
             print "graph_vlabel %s" % vlabel
             print "%s.label %s" % (key.lower(), key.capitalize())
             print "%s.draw LINE1" % key.lower()
diff --git a/plugins/nginx/nginx-combined b/plugins/nginx/nginx-combined
index a8052a3c..0adf8362 100755
--- a/plugins/nginx/nginx-combined
+++ b/plugins/nginx/nginx-combined
@@ -70,7 +70,7 @@ if ( exists $ARGV[0] and $ARGV[0] eq "config" )
 {
 	print "graph_title NGINX status: $URL\n";
 	print "graph_args --base 1000\n";
-	print "graph_category nginx\n";
+	print "graph_category webserver\n";
     print "graph_vlabel Connections\n";
 
     print "reqpsec.label Request/sec.\n";
diff --git a/plugins/nginx/nginx_connection_request b/plugins/nginx/nginx_connection_request
index 47c0faf5..989afa64 100755
--- a/plugins/nginx/nginx_connection_request
+++ b/plugins/nginx/nginx_connection_request
@@ -132,7 +132,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "autoconf" ) {
 ## Munin config method.
 if (exists $ARGV[0] and $ARGV[0] eq "config") {
   print "graph_title nginx requests/connection handled\n";
-  print "graph_category nginx\n";
+  print "graph_category webserver\n";
   print "graph_vlabel Request/Connection\n";
   print "connection_request.label requests/connection\n";
   print "connection_request.min 0\n";
diff --git a/plugins/nginx/nginx_error b/plugins/nginx/nginx_error
index 7a12262e..4d655cd5 100755
--- a/plugins/nginx/nginx_error
+++ b/plugins/nginx/nginx_error
@@ -111,7 +111,7 @@ do_ () { # Fetch
 do_config () {
   echo "graph_title $logpattern - Nginx errors per minute"
   echo 'graph_vlabel pages with http error codes / ${graph_period}'
-  echo "graph_category nginx"
+  echo "graph_category webserver"
   echo "graph_period minute"
   echo "graph_info This graph shows nginx error amount per minute"
   for k in ${!http_codes[@]}; do
diff --git a/plugins/nginx/nginx_memory b/plugins/nginx/nginx_memory
index 207af3bf..783ef7da 100755
--- a/plugins/nginx/nginx_memory
+++ b/plugins/nginx/nginx_memory
@@ -75,7 +75,7 @@ MIT
 if (exists $ARGV[0] and $ARGV[0] eq "config") {
   print "graph_title nginx RAM usage\n";
   print "graph_vlabel RAM\n";
-  print "graph_category nginx\n";
+  print "graph_category webserver\n";
   print "ram.label RAM\n";
   print "graph_args --base 1024\n";
 
diff --git a/plugins/nginx/nginx_upstream b/plugins/nginx/nginx_upstream
index ee3ab974..5528e9a1 100755
--- a/plugins/nginx/nginx_upstream
+++ b/plugins/nginx/nginx_upstream
@@ -18,7 +18,7 @@ if len(sys.argv) > 1:
         if sys.argv[1]=="config":
                 print "graph_args --base 1000 -l 0"
                 print "graph_title NGINX Upstream times"
-                print "graph_category nginx"
+                print "graph_category webserver"
                 print "graph_vlabel milliseconds"
                 print "upstream.label upstream"
                 print "upstream.warning 5000"
diff --git a/plugins/nginx/nginx_upstream_multi_ b/plugins/nginx/nginx_upstream_multi_
index d22fc80a..c76f85a5 100755
--- a/plugins/nginx/nginx_upstream_multi_
+++ b/plugins/nginx/nginx_upstream_multi_
@@ -133,7 +133,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config":
     print "multigraph nginx_upstream_multi_%s" % siteName.replace(".", "_")
     print "graph_title Requests number"
     print "graph_vlabel rps"
-    print "graph_category nginx"
+    print "graph_category webserver"
     for upstream in upstreams.keys():
         print "us%s_requests.label %s" % (sanitize(upstream), upstream)
 
@@ -144,7 +144,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config":
             print "multigraph nginx_upstream_multi_%s.%s_requests" % (sanitize(siteName), sanitize(upstream))
             print "graph_title Requests number - %s" % upstream
             print "graph_vlabel rps"
-            print "graph_category nginx"
+            print "graph_category webserver"
             print "us%s_requests.label %s" % (sanitize(upstream), upstream)
             print ""
 
@@ -155,7 +155,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config":
             print "multigraph nginx_upstream_multi_%s.%s_times" % (sanitize(siteName), sanitize(upstream))
             print "graph_title Request time - %s" % upstream
             print "graph_vlabel sec."
-            print "graph_category nginx"
+            print "graph_category webserver"
             print "us%s_times.label average" % (sanitize(upstream))
             for percentile in percentiles:
                 print "us%s_times_percentile_%s.label %s-percentile" % (sanitize(upstream), percentile, percentile)
@@ -168,7 +168,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config":
             print "multigraph nginx_upstream_multi_%s.%s_statuses" % (sanitize(siteName), sanitize(upstream))
             print "graph_title HTTP - %s" % upstream
             print "graph_vlabel rps"
-            print "graph_category nginx"
+            print "graph_category webserver"
             keylist = httpStatusList.keys()
             keylist.sort()
             for status in keylist:
@@ -182,7 +182,7 @@ if len(sys.argv) == 2 and sys.argv[1] == "config":
             print "multigraph nginx_upstream_multi_%s.%s_cache" % (sanitize(siteName), sanitize(upstream))
             print "graph_title Cache - %s" % upstream
             print "graph_vlabel rps"
-            print "graph_category nginx"
+            print "graph_category webserver"
             for status in cacheStatusList:
                 print "us%s_%s_cache.label %s" % (sanitize(status), sanitize(upstream), status)
             print ""
diff --git a/plugins/nginx/nginx_vhost_traffic b/plugins/nginx/nginx_vhost_traffic
index 826059ea..95e500a3 100755
--- a/plugins/nginx/nginx_vhost_traffic
+++ b/plugins/nginx/nginx_vhost_traffic
@@ -45,7 +45,7 @@ case $1 in
 	echo 'graph_title Nginx Virtual host traffic'
 	echo 'graph_vlabel bits out / ${graph_period}'
 	echo 'graph_args --base 1000 -l 0'
-	echo 'graph_category Nginx'
+	echo 'graph_category webserver'
 
 	i=0
 	for vhost in $VHOSTS 
diff --git a/plugins/nginx/nginx_working_set b/plugins/nginx/nginx_working_set
index 04e8b809..5de22d8f 100755
--- a/plugins/nginx/nginx_working_set
+++ b/plugins/nginx/nginx_working_set
@@ -12,7 +12,7 @@ config)
     cat <<'EOF'
 graph_title NGINX Working Set
 graph_vlabel WS Bytes
-graph_category nginx
+graph_category webserver
 graph_args --base 1024
 ws.label Working Set
 EOF
diff --git a/plugins/apache/eaccelerator b/plugins/php/eaccelerator
similarity index 99%
rename from plugins/apache/eaccelerator
rename to plugins/php/eaccelerator
index ef0871e3..9a9fcbc7 100755
--- a/plugins/apache/eaccelerator
+++ b/plugins/php/eaccelerator
@@ -77,7 +77,7 @@ if [ "$1" = "config" ]; then
 
 	echo 'graph_title Eaccelerator usage '
 	echo 'graph_args -l 0'
-	echo 'graph_category apache'
+	echo 'graph_category webserver'
 	echo 'graph_info This graph shows performance of the eaccelerator module on WWW server.'
 	
 	echo 'memorysize.label total'