diff --git a/confluent_client/bin/nodeinventory b/confluent_client/bin/nodeinventory
index 6551c1b5..59eb57f3 100755
--- a/confluent_client/bin/nodeinventory
+++ b/confluent_client/bin/nodeinventory
@@ -121,8 +121,8 @@ if len(args) > 1:
         os.execlp('nodefirmware', 'nodefirmware', noderange)
     else:
         url = '/noderange/{0}/inventory/hardware/all/system'
-        for arg in args:
-            for arg in arg.split(','):
+        for rawarg in args:
+            for arg in rawarg.split(','):
                 if arg == 'serial':
                     filters.append(re.compile('serial number'))
                 elif arg == 'model':
diff --git a/confluent_osdeploy/common/profile/scripts/confignet b/confluent_osdeploy/common/profile/scripts/confignet
index 0108c540..9a972d55 100644
--- a/confluent_osdeploy/common/profile/scripts/confignet
+++ b/confluent_osdeploy/common/profile/scripts/confignet
@@ -625,18 +625,18 @@ if __name__ == '__main__':
                     time.sleep(1)
                     continue
             dc = json.loads(dc)
-        iname = get_interface_name(idxmap[curridx], nc.get('default', {}))
-        if iname:
-            for iname in iname.split(','):
+        inames = get_interface_name(idxmap[curridx], nc.get('default', {}))
+        if inames:
+            for iname in inames.split(','):
                 if 'default' in netname_to_interfaces:
                     netname_to_interfaces['default']['interfaces'].add(iname)
                 else:
                     netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
         for netname in nc.get('extranets', {}):
             uname = '_' + netname
-            iname = get_interface_name(idxmap[curridx], nc['extranets'][netname])
-            if iname:
-                for iname in iname.split(','):
+            inames = get_interface_name(idxmap[curridx], nc['extranets'][netname])
+            if inames:
+                for iname in inames.split(','):
                     if uname in netname_to_interfaces:
                         netname_to_interfaces[uname]['interfaces'].add(iname)
                     else:
diff --git a/confluent_osdeploy/debian/profiles/default/scripts/confignet b/confluent_osdeploy/debian/profiles/default/scripts/confignet
index 91734b5a..61d8d4ff 100644
--- a/confluent_osdeploy/debian/profiles/default/scripts/confignet
+++ b/confluent_osdeploy/debian/profiles/default/scripts/confignet
@@ -545,18 +545,18 @@ if __name__ == '__main__':
                     time.sleep(1)
                     continue
             dc = json.loads(dc)
-        iname = get_interface_name(idxmap[curridx], nc.get('default', {}))
-        if iname:
-            for iname in iname.split(','):
+        inames = get_interface_name(idxmap[curridx], nc.get('default', {}))
+        if inames:
+            for iname in inames.split(','):
                 if 'default' in netname_to_interfaces:
                     netname_to_interfaces['default']['interfaces'].add(iname)
                 else:
                     netname_to_interfaces['default'] = {'interfaces': set([iname]), 'settings': nc['default']}
         for netname in nc.get('extranets', {}):
             uname = '_' + netname
-            iname = get_interface_name(idxmap[curridx], nc['extranets'][netname])
-            if iname:
-                for iname in iname.split(','):
+            inames = get_interface_name(idxmap[curridx], nc['extranets'][netname])
+            if inames:
+                for iname in inames.split(','):
                     if uname in netname_to_interfaces:
                         netname_to_interfaces[uname]['interfaces'].add(iname)
                     else:
diff --git a/confluent_server/aiohmi/redfish/oem/lenovo/xcc.py b/confluent_server/aiohmi/redfish/oem/lenovo/xcc.py
index f41a252c..a8343cd1 100644
--- a/confluent_server/aiohmi/redfish/oem/lenovo/xcc.py
+++ b/confluent_server/aiohmi/redfish/oem/lenovo/xcc.py
@@ -623,12 +623,12 @@ class OEMHandler(generic.OEMHandler):
     async def _get_agentless_firmware(self, components):
         skipkeys = set([])
         wc = await self.wc()
-        adata = await wc.grab_json_response(
+        adapterdata = await wc.grab_json_response(
             '/api/dataset/imm_adapters?params=pci_GetAdapters')
         fdata = await wc.grab_json_response(
             '/api/function/adapter_update?params=pci_GetAdapterListAndFW')
         anames = set()
-        for adata in adata.get('items', []):
+        for adata in adapterdata.get('items', []):
             baseaname = adata['adapterName']
             aname = baseaname
             idx = 1