diff --git a/cylc/flow/data_store_mgr.py b/cylc/flow/data_store_mgr.py
index 4f19f38df8..e0c01afeaa 100644
--- a/cylc/flow/data_store_mgr.py
+++ b/cylc/flow/data_store_mgr.py
@@ -806,11 +806,11 @@ def generate_definition_elements(self):
                 )
                 famcfg = config.cfg['runtime'][name]
                 user_defined_meta = {}
-                for key, val in famcfg.get('meta', {}).items():
-                    if key in ['title', 'description', 'URL']:
-                        setbuff(family.meta, key, val)
+                for meta_key, val in famcfg.get('meta', {}).items():
+                    if meta_key in ['title', 'description', 'URL']:
+                        setbuff(family.meta, meta_key, val)
                     else:
-                        user_defined_meta[key] = val
+                        user_defined_meta[meta_key] = val
                 family.meta.user_defined = json.dumps(user_defined_meta)
                 family.parents.extend(
                     self.definition_id(p_name)
diff --git a/cylc/flow/id_cli.py b/cylc/flow/id_cli.py
index d427d40d6e..9472d070af 100644
--- a/cylc/flow/id_cli.py
+++ b/cylc/flow/id_cli.py
@@ -513,12 +513,12 @@ async def _expand_workflow_tokens(tokens_list, match_active=True):
             # remove the original entry
             multi_mode = True
             tokens_list.remove(tokens)
-            async for tokens in _expand_workflow_tokens_impl(
+            async for expanded_tokens in _expand_workflow_tokens_impl(
                 tokens,
                 match_active=match_active,
             ):
                 # add the expanded tokens back onto the list
-                tokens_list.append(tokens)
+                tokens_list.append(expanded_tokens)
     return multi_mode