Replace some more FQCNs.

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/ansible/plugins/action/gather_facts.py b/lib/ansible/plugins/action/gather_facts.py
index 4276c090b9..eac63e1736 100644
--- a/lib/ansible/plugins/action/gather_facts.py
+++ b/lib/ansible/plugins/action/gather_facts.py
@@ -21,7 +21,7 @@ class ActionModule(ActionBase):
         mod_args = self._task.args.copy()
 
         # deal with 'setup specific arguments'
-        if fact_module not in ['ansible.legacy.setup', 'ansible.builtin.setup', 'setup']:
+        if fact_module not in C._ACTION_SETUP:
             # network facts modules must support gather_subset
             if self._connection._load_name not in ('network_cli', 'httpapi', 'netconf'):
                 subset = mod_args.pop('gather_subset', None)
diff --git a/lib/ansible/plugins/action/normal.py b/lib/ansible/plugins/action/normal.py
index 1582c8619e..cb91521ac5 100644
--- a/lib/ansible/plugins/action/normal.py
+++ b/lib/ansible/plugins/action/normal.py
@@ -17,6 +17,7 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from ansible import constants as C
 from ansible.plugins.action import ActionBase
 from ansible.utils.vars import merge_hash
 
@@ -48,7 +49,7 @@ class ActionModule(ActionBase):
             # hack to keep --verbose from showing all the setup module result
             # moved from setup module as now we filter out all _ansible_ from result
             # FIXME: is this still accurate with gather_facts etc, or does it need support for FQ and other names?
-            if self._task.action == 'setup':
+            if self._task.action in C._ACTION_SETUP:
                 result['_ansible_verbose_override'] = True
 
         if not wrap_async: