diff --git a/html/includes/graphs/device/frequencies.inc.php b/html/includes/graphs/device/frequencies.inc.php
index 357bc58502..0408895c35 100644
--- a/html/includes/graphs/device/frequencies.inc.php
+++ b/html/includes/graphs/device/frequencies.inc.php
@@ -8,7 +8,7 @@ $rrd_options .= " -l 0 -E ";
 $iter = "1";
 $sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='freq' AND device_id = '$id'");
 $rrd_options .= " COMMENT:'                       Cur     Min      Max\\n'";
-while($frequency = mysql_fetch_array($sql))
+while ($frequency = mysql_fetch_array($sql))
 {
   switch ($iter)
   {
@@ -40,10 +40,10 @@ while($frequency = mysql_fetch_array($sql))
   $hostname = gethostbyid($frequency['device_id']);
 
   $descr = substr(str_pad($frequency['sensor_descr'], 15),0,15);
-  $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("freq-" . $frequency['sensor_descr'] . ".rrd");
+  $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("frequency-" . $frequency['sensor_descr'] . ".rrd");
   $sensor_id = $frequency['sensor_id'];
 
-  $rrd_options .= " DEF:freq$sensor_id=$rrd_filename:freq:AVERAGE";
+  $rrd_options .= " DEF:freq$sensor_id=$rrd_filename:sensor:AVERAGE";
   $rrd_options .= " LINE1:freq$sensor_id#".$colour.":'" . $descr . "'";
   $rrd_options .= " GPRINT:freq$sensor_id:AVERAGE:%5.2lfHz";
   $rrd_options .= " GPRINT:freq$sensor_id:MIN:%5.2lfHz";
@@ -52,5 +52,4 @@ while($frequency = mysql_fetch_array($sql))
   $iter++;
 }
 
-
-?>
+?>
\ No newline at end of file
diff --git a/html/includes/graphs/device/humidity.inc.php b/html/includes/graphs/device/humidity.inc.php
index 735cb3e541..6b35e93369 100644
--- a/html/includes/graphs/device/humidity.inc.php
+++ b/html/includes/graphs/device/humidity.inc.php
@@ -8,7 +8,7 @@ $rrd_options .= " -l 0 -E ";
 $iter = "1";
 $sql = mysql_query("SELECT * FROM sensors WHERE sensor_class='humidity' AND device_id = '$id' ORDER BY sensor_index");
 $rrd_options .= " COMMENT:'                           Cur   Min   Max\\n'";
-while($humidity = mysql_fetch_array($sql))
+while ($humidity = mysql_fetch_array($sql))
 {
   switch ($iter)
   {
@@ -38,7 +38,7 @@ while($humidity = mysql_fetch_array($sql))
   }
 
   $humidity['sensor_descr_fixed'] = substr(str_pad($humidity['sensor_descr'], 22),0,22);
-  $humidityrrd  = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_type']."-".$humidity['sensor_index']) . ".rrd");
+  $humidityrrd  = $config['rrd_dir'] . "/".$device['hostname']."/".safename("humidity-" . safename($humidity['sensor_descr']) . ".rrd");
   $rrd_options .= " DEF:sensor" . $humidity['sensor_id'] . "=$humidityrrd:sensor:AVERAGE ";
   $rrd_options .= " LINE1:sensor" . $humidity['sensor_id'] . "#" . $colour . ":'" . str_replace(':','\:',str_replace('\*','*',quotemeta($humidity['sensor_descr_fixed']))) . "' ";
   $rrd_options .= " GPRINT:sensor" . $humidity['sensor_id'] . ":LAST:%3.0lf%% ";
@@ -47,5 +47,4 @@ while($humidity = mysql_fetch_array($sql))
   $iter++;
 }
 
-
-?>
+?>
\ No newline at end of file