diff --git a/includes/html/graphs/device/storage.inc.php b/includes/html/graphs/device/storage.inc.php
index 2abd67f513..dd44518b84 100644
--- a/includes/html/graphs/device/storage.inc.php
+++ b/includes/html/graphs/device/storage.inc.php
@@ -6,7 +6,7 @@ $scale_max = '100';
 require 'includes/html/graphs/common.inc.php';
 
 $iter         = '1';
-$rrd_options .= " COMMENT:'                    Size      Used    %age\\l'";
+$rrd_options .= " COMMENT:'                        Size      Used    % Used\\l'";
 
 foreach (dbFetchRows('SELECT * FROM storage where device_id = ?', array($device['device_id'])) as $storage) {
     // FIXME generic colour function
@@ -27,7 +27,7 @@ foreach (dbFetchRows('SELECT * FROM storage where device_id = ?', array($device[
         $iter   = '0';
     }
 
-    $descr        = rrdtool_escape($storage['storage_descr'], 12);
+    $descr        = rrdtool_escape($storage['storage_descr'], 16);
     $rrd          = rrd_name($device['hostname'], array('storage', $storage['storage_mib'], $storage['storage_descr']));
     $rrd_options .= " DEF:{$storage['storage_id']}used=$rrd:used:AVERAGE";
     $rrd_options .= " DEF:{$storage['storage_id']}free=$rrd:free:AVERAGE";
diff --git a/includes/html/graphs/storage/usage.inc.php b/includes/html/graphs/storage/usage.inc.php
index 9f57e58ec4..4403bcbad4 100644
--- a/includes/html/graphs/storage/usage.inc.php
+++ b/includes/html/graphs/storage/usage.inc.php
@@ -9,14 +9,14 @@ $rrd_options .= ' -b 1024';
 
 $iter = '1';
 
-$rrd_options .= " COMMENT:'                    Size      Free   % Used\\n'";
+$rrd_options .= " COMMENT:'                        Size      Free   % Used\\n'";
 
 $hostname = gethostbyid($storage['device_id']);
 
 $colour      = 'CC0000';
 $colour_area = 'ffaaaa';
 
-$descr = rrdtool_escape($storage['storage_descr'], 12);
+$descr = rrdtool_escape($storage['storage_descr'], 16);
 
 $percentage = round($storage['storage_perc'], 0);
 
@@ -33,7 +33,7 @@ $rrd_options .= ' GPRINT:free:LAST:%6.2lf%sB';
 $rrd_options .= " GPRINT:perc:LAST:%5.2lf%%\\n";
 
 if ($_GET['previous']) {
-    $descr = rrdtool_escape('Prev '.$storage['storage_descr'], 12);
+    $descr = rrdtool_escape('Prev '.$storage['storage_descr'], 16);
 
     $colour      = '99999999';
     $colour_area = '66666666';