diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index fbddea72c..171db75a4 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -404,7 +404,7 @@ $os = 'nos';
 $config['os'][$os]['text']             = 'Brocade NOS';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['ifname']           = 1;
-$config['os'][$os]['ifalias_null']     = 1;
+$config['os'][$os]['descr_to_alias']   = 1;
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index c0e457673..4723b2f9e 100644
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -325,9 +325,9 @@ foreach ($ports as $port) {
         echo 'VLAN == '.$this_port['ifVlan'];
 
 	// When devices do not provide ifAlias data, populate with ifDescr data if configured
-        if (($this_port['ifAlias'] == '' || $this_port['ifAlias'] == NULL) && $config['os'][$device['os']]['ifalias_null'] == 1) {
+        if ($this_port['ifAlias'] == '' || $this_port['ifAlias'] == NULL) || ($config['os'][$device['os']]['descr_to_alias'] == 1) {
             $this_port['ifAlias'] = $this_port['ifDescr'];
-            d_echo('Using ifDescr due to ifAlias being NULL');
+            d_echo('Using ifDescr as ifAlias');
         }
 
         // Update IF-MIB data