diff --git a/html/includes/graphs/multiport/bits_separate.inc.php b/html/includes/graphs/multiport/bits_separate.inc.php
index c6ab907879..33404d63c7 100644
--- a/html/includes/graphs/multiport/bits_separate.inc.php
+++ b/html/includes/graphs/multiport/bits_separate.inc.php
@@ -8,8 +8,8 @@ foreach (explode(',', $vars['id']) as $ifid) {
     if (rrdtool_check_rrd_exists($rrd_file)) {
         $port = cleanPort($port);
         $rrd_list[$i]['filename']  = $rrd_file;
-        $rrd_list[$i]['descr']     = $port['hostname'].' '.$port['ifDescr'];
-        $rrd_list[$i]['descr_in']  = $port['hostname'];
+        $rrd_list[$i]['descr']     = format_hostname($port, $port['hostname']).' '.$port['ifDescr'];
+        $rrd_list[$i]['descr_in']  = format_hostname($port, $port['hostname']);
         $rrd_list[$i]['descr_out'] = makeshortif($port['label']);
         $i++;
     }
diff --git a/html/includes/reports/ports.csv.inc.php b/html/includes/reports/ports.csv.inc.php
index e546793a0d..43206cb431 100644
--- a/html/includes/reports/ports.csv.inc.php
+++ b/html/includes/reports/ports.csv.inc.php
@@ -159,7 +159,7 @@ foreach ($ports as $port) {
         $port['out_rate'] = formatRates(($port['ifOutOctets_rate'] * 8));
         $port             = cleanPort($port, $device);
         $csv[]            = array(
-            $port['hostname'],
+            format_hostname($port, $port['hostname']),
             fixIfName($port['label']),
             $speed,
             $port['in_rate'],