diff --git a/plugins/apache/apache_byprojects/byprojects_access b/plugins/apache/apache_byprojects/byprojects_access
index 5f917077..12862b9e 100644
--- a/plugins/apache/apache_byprojects/byprojects_access
+++ b/plugins/apache/apache_byprojects/byprojects_access
@@ -56,7 +56,7 @@ if(defined($ARGV[0])) {
     print "graph_title $server access byprojects\n";
     print "graph_total Total\n";
     print "graph_vlabel Access by \${graph_period}\n";
-    print "graph_category $server\n";
+    print "graph_category webserver\n";
     print "graph_info This graph show $server access by various projects.\n";
     while ((my $project, my @files) = each(%logs)) {
       print $project.".label $project\n";
diff --git a/plugins/apache/apache_byprojects/byprojects_bandwidth b/plugins/apache/apache_byprojects/byprojects_bandwidth
index 8370cf79..65443d6f 100644
--- a/plugins/apache/apache_byprojects/byprojects_bandwidth
+++ b/plugins/apache/apache_byprojects/byprojects_bandwidth
@@ -62,7 +62,7 @@ if(defined($ARGV[0])) {
     print "graph_title $server total bandwidth byprojects\n";
     print "graph_total Total\n";
     print "graph_vlabel Bits\n";
-    print "graph_category $server\n";
+    print "graph_category webserver\n";
     print "graph_info This graph show $server total bandwidth used by various " .
      "projects.\n";
     while ((my $project, my @files) = each(%logs)) {
diff --git a/plugins/apache/apache_byprojects/byprojects_inout_bandwidth b/plugins/apache/apache_byprojects/byprojects_inout_bandwidth
index 29dbecf9..55e6e3ad 100644
--- a/plugins/apache/apache_byprojects/byprojects_inout_bandwidth
+++ b/plugins/apache/apache_byprojects/byprojects_inout_bandwidth
@@ -59,7 +59,7 @@ if(defined($ARGV[0])) {
     print "graph_title $server in/out bandwidth byprojects\n";
     print "graph_args --base 1000\n";
     print "graph_vlabel bits per \${graph_period} in (-) / out (+)\n";
-    print "graph_category $server\n";
+    print "graph_category webserver\n";
     print "graph_info This graph show $server in/out bandwidth used by various" .
      " projects.\n";
     while ((my $project, my @files) = each(%logs)) {
diff --git a/plugins/aris/aris_players b/plugins/aris/aris_players
index 93c9df74..dea4046d 100755
--- a/plugins/aris/aris_players
+++ b/plugins/aris/aris_players
@@ -31,7 +31,7 @@ $aris_db_pass='password';
 if ($argv[1]=='config'){
     print "graph_title ARIS active players\n";
     print "graph_vlabel Players Count\n";
-    print "graph_category ARIS\n";
+    print "graph_category games\n";
     print "players.label player count\n";
 
     exit;
diff --git a/plugins/apache/http-response-times b/plugins/http/http-response-times
similarity index 100%
rename from plugins/apache/http-response-times
rename to plugins/http/http-response-times
diff --git a/plugins/php/eaccelerator-python b/plugins/php/eaccelerator-python
index 2260db1f..dc2bad21 100755
--- a/plugins/php/eaccelerator-python
+++ b/plugins/php/eaccelerator-python
@@ -32,7 +32,7 @@ config = {
             'graph_title eacceleratory memory usage\n' +
             'graph_info This graph shows memory performance of PHP eaccelerator module\n' +
             'graphs_args -1 0\n' +
-            'graph_category php-eaccelerator\n' +
+            'graph_category webserver\n' +
             
             'memorysize.label total\n' +
             'memorysize.draw AREA\n' +
@@ -47,7 +47,7 @@ config = {
             'graph_title eacceleratory cached scripts\n' +
             'graph_info This graph shows how many scripts are cached by PHP eaccelerator module\n' +
             'graphs_args -1 0\n' +
-            'graph_category php-eaccelerator\n' +
+            'graph_category webserver\n' +
             
             'cachedscripts.label cached scripts\n' +
             'cachedscripts.draw LINE1\n' +
diff --git a/plugins/php/eaccelerator-usage b/plugins/php/eaccelerator-usage
index 6f72e1b4..f95a19d1 100755
--- a/plugins/php/eaccelerator-usage
+++ b/plugins/php/eaccelerator-usage
@@ -51,7 +51,7 @@ if ($#ARGV eq 0) {
 	if ($ARGV[0] eq 'config') {
 		print "eAccelerator\n";
 		print "graph_title eAccelerator\n";
-		print "graph_category php-eaccelerator\n";
+		print "graph_category webserver\n";
 		print "memusage.label Memory Usage %\n";
 		print "memusage.warning 95\n";
 		print "memusage.critical 95\n";
diff --git a/plugins/php/php-cgi b/plugins/php/php-cgi
index 7e809a78..c9b8009e 100755
--- a/plugins/php/php-cgi
+++ b/plugins/php/php-cgi
@@ -23,7 +23,7 @@ fi
 if [ "$1" = "config" ]; then
   echo "graph_title PHP CGI Memory";
   echo "graph_vlabel PHP CGI Memory usage in GB";
-  echo "graph_category php-cgi";
+  echo "graph_category processes";
   echo "graph_args -l 0";
   echo "php_cgi_ram.label PHP CGI Used RAM";
   echo "php_cgi_ram.draw LINE2";
diff --git a/plugins/php/php-fastcgi b/plugins/php/php-fastcgi
index b79d3168..15cb1ec3 100755
--- a/plugins/php/php-fastcgi
+++ b/plugins/php/php-fastcgi
@@ -90,7 +90,7 @@ if (exists $ARGV[0] and $ARGV[0] eq "config") {
 
   print "graph_title PHP CGI [MB]\n";
   print "graph_vlabel PHP CGI Memory usage\n";
-  print "graph_category php-fastcgi\n";
+  print "graph_category processes\n";
   print "graph_args -l 0\n";
   print "php_cgi_ram.label PHP CGI Used RAM\n";
   print "php_cgi_ram.draw LINE2\n";
diff --git a/plugins/php/php5-fpm_status b/plugins/php/php5-fpm_status
index b05bb485..73cc92c4 100755
--- a/plugins/php/php5-fpm_status
+++ b/plugins/php/php5-fpm_status
@@ -24,7 +24,7 @@ if [ "$1" = "config" ]; then
   echo "graph_args --base 1000 -l 0"
   echo "graph_vlabel Processes"
   echo "graph_scale yes"
-  echo "graph_category php-fpm"
+  echo "graph_category processes"
   echo "graph_info This graph shows the php5-fpm process manager status from pool: $pool"
   echo "active.label Active processes"
   echo "active.type GAUGE"
diff --git a/plugins/php/php_apc_ b/plugins/php/php_apc_
index 46a9ea63..be916546 100755
--- a/plugins/php/php_apc_
+++ b/plugins/php/php_apc_
@@ -56,7 +56,7 @@ cat <<'EOM'
 graph_title APC Memory usage
 graph_args -l 0 --base 1024
 graph_vlabel Memory usage
-graph_category php-apc
+graph_category memory
 graph_order mem_used mem_avail
 graph_total Total
 mem_avail.label Memory available
diff --git a/plugins/php/php_eaccelerator b/plugins/php/php_eaccelerator
index 0091d7b0..d8a8a818 100755
--- a/plugins/php/php_eaccelerator
+++ b/plugins/php/php_eaccelerator
@@ -34,7 +34,7 @@ url   = ENV['url'] || 'http://127.0.0.1/control.php'
 if ARGV[0]=="config"
   print "EAccelerator Monitoring\n"
   print "graph_title PHP Eaccelerator\n"
-  print "graph_category php-eaccelerator\n"
+  print "graph_category webserver\n"
   print "Memoryusagepercentage.label Memory Usage %\n"  
   print "Memoryusagepercentage.warning 95\n"  
   print "Memoryusagepercentage.critical 95\n"  
diff --git a/plugins/php/php_errors_ b/plugins/php/php_errors_
index e8788368..dd073a58 100644
--- a/plugins/php/php_errors_
+++ b/plugins/php/php_errors_
@@ -47,6 +47,7 @@ fi
 if [[ $1 == config ]]; then
         echo 'graph_title PHP Errors from ' $LOGS
         echo 'graph_args --base 1000 -l 0'
+        echo 'graph_category webserver'
         echo 'graph_vlabel Errors'
         echo 'LogWarning.label PHP Warning errors'
         echo 'LogNotice.label PHP Notice errors'
diff --git a/plugins/php/php_fpm_process b/plugins/php/php_fpm_process
index 89b6acfd..873b814e 100755
--- a/plugins/php/php_fpm_process
+++ b/plugins/php/php_fpm_process
@@ -126,7 +126,7 @@ graph_title php5-fpm processes for $pool
 graph_args --base 1000 -l 0
 graph_vlabel Processes
 graph_scale yes
-graph_category php-fpm
+graph_category processes
 graph_info This graph shows the php5-fpm process manager status from pool: $pool
 active.label Active processes
 active.type GAUGE
@@ -146,7 +146,7 @@ graph_title php5-fpm slow requests $pool
 graph_args --base 1000 -l 0
 graph_vlabel Slow requests
 graph_scale yes
-graph_category php-fpm
+graph_category processes
 graph_info This graph shows the php5-fpm slow request from pool: $pool
 slow_requests.label Slow requests
 slow_requests.type DERIVE
diff --git a/plugins/php/php_opcache b/plugins/php/php_opcache
index 04af966e..4055d72f 100755
--- a/plugins/php/php_opcache
+++ b/plugins/php/php_opcache
@@ -36,7 +36,7 @@ cat <<'EOM'
 graph_title OPCache Memory usage
 graph_args -l 0 --base 1024
 graph_vlabel Memory usage
-graph_category php-opcache
+graph_category memory
 graph_order mem_used mem_free mem_wasted
 graph_total Total
 mem_free.label Memory Free
diff --git a/plugins/php/php_sessions b/plugins/php/php_sessions
index 50b1629c..eb947f42 100755
--- a/plugins/php/php_sessions
+++ b/plugins/php/php_sessions
@@ -53,7 +53,7 @@ fi
 if [ "$1" = "config" ]; then
         echo 'graph_title Apache/PHP Sessions'
         echo 'graph_info This graph shows active Apache/PHP sessions.'
-        echo 'graph_category php-sessions'
+        echo 'graph_category webserver'
         echo "graph_args --lower-limit 0"
         echo 'graph_vlabel n'