diff --git a/gmond/python_modules/conf.d/diskusage.pyconf b/gmond/python_modules/conf.d/diskusage.pyconf
index 04a7ef1..6dffd10 100644
--- a/gmond/python_modules/conf.d/diskusage.pyconf
+++ b/gmond/python_modules/conf.d/diskusage.pyconf
@@ -11,7 +11,7 @@ collection_group {
   collect_every = 10
   time_threshold = 50
   metric {
-    name = "<disk_used-metric-name>"
+    name_match = "disk_used-([0-9a-zA-Z_. -]+)"
     value_threshold = 1.0
   }
 }
@@ -20,7 +20,7 @@ collection_group {
   collect_once = yes
   time_threshold = 20
   metric {
-    name = "<disk_total-metric-name>"
+    name_match = "disk_total-([0-9a-zA-Z_. -]+)"
   }
 }
 
diff --git a/gmond/python_modules/disk/multidisk.py b/gmond/python_modules/disk/multidisk.py
index d895b22..f8c6f97 100644
--- a/gmond/python_modules/disk/multidisk.py
+++ b/gmond/python_modules/disk/multidisk.py
@@ -82,16 +82,20 @@ def DiskUsed_Handler(name):
 
 def Init_Metric (line, name, tmax, type, units, slope, fmt, desc, handler):
     '''Create a metric definition dictionary object for a device.'''
-    metric_name = line[0] + '-' + name
+    if line[1] == '/':
+        metric_name = name + '-rootfs'
+    else:
+        metric_name = name + '-' + line[1].replace('/','-').lstrip('-')
     
-    d = {'name': metric_name.replace('/', '-').lstrip('-'),
+    d = {'name': metric_name,
         'call_back': handler,
         'time_max': tmax,
         'value_type': type,
         'units': units,
         'slope': slope,
         'format': fmt,
-        'description': desc, 
+        'description': desc + ' on ' + line[1], 
+        'groups': 'disk', 
         'mount': line[1]}
     return d