diff --git a/html/includes/forms/update-ifalias.inc.php b/html/includes/forms/update-ifalias.inc.php
index 55a10e47c..f792ec520 100644
--- a/html/includes/forms/update-ifalias.inc.php
+++ b/html/includes/forms/update-ifalias.inc.php
@@ -30,10 +30,10 @@ if (!empty($ifName) && is_numeric($port_id)) {
     if (dbUpdate(array('ifAlias'=>$descr), 'ports', '`port_id`=?', array($port_id)) > 0) {
         $device = device_by_id_cache($device_id);
         if ($descr === 'repoll') {
-            del_dev_attrib($device, 'ifName');
+            del_dev_attrib($device, 'ifName:'.$ifName);
         }
         else {
-            set_dev_attrib($device, 'ifName', $ifName);
+            set_dev_attrib($device, 'ifName:'.$ifName, 1);
         }
         $status = 'ok';
     }
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index 88492bf6a..784fecfd9 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -318,7 +318,7 @@ foreach ($ports as $port) {
         foreach ($data_oids as $oid) {
 
             if ($oid == 'ifAlias') {
-                if (get_dev_attrib($device, 'ifName', $port['ifName'])) {
+                if (get_dev_attrib($device, 'ifName:'.$port['ifName'], 1)) {
                     $this_port['ifAlias'] = $port['ifAlias'];
                 }
             }