diff --git a/plugins/zope/zodb/README b/plugins/zope/README-zodb
similarity index 100%
rename from plugins/zope/zodb/README
rename to plugins/zope/README-zodb
diff --git a/plugins/zope/zodb/scripts_python/munin_cache_parameters.py b/plugins/zope/scripts_zodb/munin_cache_parameters.py
similarity index 100%
rename from plugins/zope/zodb/scripts_python/munin_cache_parameters.py
rename to plugins/zope/scripts_zodb/munin_cache_parameters.py
diff --git a/plugins/zope/zodb/scripts_python/munin_db_activity.py b/plugins/zope/scripts_zodb/munin_db_activity.py
similarity index 100%
rename from plugins/zope/zodb/scripts_python/munin_db_activity.py
rename to plugins/zope/scripts_zodb/munin_db_activity.py
diff --git a/plugins/zope/zodb/zope_cache_parameters b/plugins/zope/zope_cache_parameters
similarity index 97%
rename from plugins/zope/zodb/zope_cache_parameters
rename to plugins/zope/zope_cache_parameters
index cfdf3813..a7b30700 100755
--- a/plugins/zope/zodb/zope_cache_parameters
+++ b/plugins/zope/zope_cache_parameters
@@ -17,7 +17,7 @@ if len(argv) > 1 and argv[1] == 'config':
     # as a percentage of target possibly..
 
     print """graph_title Zope cache parameters
-    graph_category Zope
+    graph_category appserver
     graph_info A grap of the main data on the "Cache Parameters" tab of the main DB in the zope control panel.""".replace("\n    ","\n")
     for i in range(0,len(conns)):
         print """obs_in_db%(i)s.label Z%(i)s Obs in DB
diff --git a/plugins/zope/zope_conflict_errors b/plugins/zope/zope_conflict_errors
index d496043e..59ad66a6 100755
--- a/plugins/zope/zope_conflict_errors
+++ b/plugins/zope/zope_conflict_errors
@@ -34,7 +34,7 @@ if len(argv) > 1:
 
         print """graph_title Zope Conflict Errors 
     graph_vlabel Count 
-    graph_category Zope
+    graph_category appserver
     graph_info The number of conflict errors in event logs over the past 24h""".replace("\n    ","\n")
         for i in range(0,len(logs)):
             print """error_count%(i)s.label %(n)s error count"""% dict(i=i,
diff --git a/plugins/zope/zodb/zope_db_activity b/plugins/zope/zope_db_activity
similarity index 97%
rename from plugins/zope/zodb/zope_db_activity
rename to plugins/zope/zope_db_activity
index 64175fb9..ddcbbef6 100755
--- a/plugins/zope/zodb/zope_db_activity
+++ b/plugins/zope/zope_db_activity
@@ -15,7 +15,7 @@ if len(argv) > 1 and argv[1] == 'config':
 
     print """graph_title Zope Database Activity
     graph_vlabel Count / 5 min.
-    graph_category Zope
+    graph_category appserver
     graph_info The number of Reads, Stores, and Connections that happens in the ZODB backend. The data comes from the same source as that in the "Recent Database Activity" tab in the zope control panel.""".replace("\n    ","\n")
     for i in range(0,len(conns)):
         print """load_count%(i)s.label Z%(i)s Loads