diff --git a/plugins/cpu/multicpu1sec-c.c b/plugins/cpu/multicpu1sec-c.c
index 3e018ad8..ab8a8890 100644
--- a/plugins/cpu/multicpu1sec-c.c
+++ b/plugins/cpu/multicpu1sec-c.c
@@ -48,7 +48,7 @@ int config() {
 
 	printf(
 		"graph_title multicpu1sec\n"
-		"graph_category system::1sec\n"
+		"graph_category 1sec\n"
 		"graph_vlabel average cpu use %%\n"
 		"graph_scale no\n"
 		"graph_total All CPUs\n"
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_blocks-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-1.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_blocks-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-1.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_nonzeroreq-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-2.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_nonzeroreq-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-2.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_outstanding-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-3.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_outstanding-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-3.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_queue-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-4.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_queue-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-4.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_req-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-5.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_req-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-5.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_ticks-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-6.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_ticks-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-6.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_ticks_total-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-7.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_ticks_total-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-7.png
diff --git a/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_trespasses-day.png b/plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-8.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_block_lun_perfdata_emc_vnx_block_trespasses-day.png
rename to plugins/emc/example-graphs/emc_vnx_block_lun_perfdata-8.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_cpu_percent-day.png b/plugins/emc/example-graphs/emc_vnx_file_-1.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_cpu_percent-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-1.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_filecache-day.png b/plugins/emc/example-graphs/emc_vnx_file_-2.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_filecache-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-2.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_fileresolve-day.png b/plugins/emc/example-graphs/emc_vnx_file_-3.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_fileresolve-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-3.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_memory-day.png b/plugins/emc/example-graphs/emc_vnx_file_-4.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_memory-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-4.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_network_b-day.png b/plugins/emc/example-graphs/emc_vnx_file_-5.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_network_b-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-5.png
diff --git a/plugins/emc/example-graphs/emc_vnx_file_emc_vnx_storage_b-day.png b/plugins/emc/example-graphs/emc_vnx_file_-6.png
similarity index 100%
rename from plugins/emc/example-graphs/emc_vnx_file_emc_vnx_storage_b-day.png
rename to plugins/emc/example-graphs/emc_vnx_file_-6.png
diff --git a/plugins/other/uustat b/plugins/uucp/uustat
similarity index 98%
rename from plugins/other/uustat
rename to plugins/uucp/uustat
index 46c54079..76bd6de7 100755
--- a/plugins/other/uustat
+++ b/plugins/uucp/uustat
@@ -92,7 +92,7 @@ if (@ARGV > 0 && $ARGV[0] eq 'config') {
     print "graph_args -l 0\n";
     print "graph_vlabel packages\n";
     print "graph_scale no\n";
-    print "graph_category postfix\n";
+    print "graph_category mail\n";
 
     foreach my $host (hosts) {
 	next if host_excluded $host;