diff --git a/includes/polling/os/junos.inc.php b/includes/polling/os/junos.inc.php
index ea4f3227e6..e18d8f0d16 100644
--- a/includes/polling/os/junos.inc.php
+++ b/includes/polling/os/junos.inc.php
@@ -27,7 +27,7 @@ if (is_numeric($cpu_usage))
 {
   if (!is_file($cpurrd))
   {
-    rrd_create($cpurrd," --step 300 DS:LOAD:GAUGE:600:-1:100 RRA:AVERAGE:0.5:1:1200                  RRA:AVERAGE:0.5:1:2000 \
+    rrdtool_create($cpurrd," --step 300 DS:LOAD:GAUGE:600:-1:100 RRA:AVERAGE:0.5:1:1200                  RRA:AVERAGE:0.5:1:2000 \
                     RRA:AVERAGE:0.5:6:2000 \
                     RRA:AVERAGE:0.5:24:2000 \
                     RRA:AVERAGE:0.5:288:2000 \
diff --git a/includes/polling/port-poe.inc.php b/includes/polling/port-poe.inc.php
index 7bee62fda5..76b8e54d43 100755
--- a/includes/polling/port-poe.inc.php
+++ b/includes/polling/port-poe.inc.php
@@ -31,7 +31,7 @@ if ($port_stats[$port['ifIndex']] && $port['ifType'] == "ethernetCsmacd"
       $rrd_create .= " DS:PortConsumption:DERIVE:600:0:U";
       $rrd_create .= " DS:PortMaxPwrDrawn:GAUGE:600:0:U ";
 
-      rrd_create($rrdfile, $rrd_create);
+      rrdtool_create($rrdfile, $rrd_create);
     }
 
     $upd = "$polled:".$port['cpeExtPsePortPwrAllocated'].":".$port['cpeExtPsePortPwrAvailable'].":".$port['cpeExtPsePortPwrConsumption'].":".$port['cpeExtPsePortMaxPwrDrawn'];