diff --git a/plugins/callback/say.py b/plugins/callback/say.py
index b8e69932e1..b3ba8bc042 100644
--- a/plugins/callback/say.py
+++ b/plugins/callback/say.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
     description:
       - This plugin will use the 'say' or 'espeak' program to "speak" about play events.
     notes:
-      - In 2.8, this callback has been renamed from C(osx_say) into M(say).
+      - In 2.8, this callback has been renamed from C(osx_say) into M(community.general.say).
 '''
 
 import distutils.spawn
diff --git a/plugins/doc_fragments/docker.py b/plugins/doc_fragments/docker.py
index 80975ff30f..ad3efb1f75 100644
--- a/plugins/doc_fragments/docker.py
+++ b/plugins/doc_fragments/docker.py
@@ -101,7 +101,7 @@ notes:
     with the product that sets up the environment. It will set these variables for you. See
     U(https://docs.docker.com/machine/reference/env/) for more details.
   - When connecting to Docker daemon with TLS, you might need to install additional Python packages.
-    For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(pip).
+    For the Docker SDK for Python, version 2.4 or newer, this can be done by installing C(docker[tls]) with M(ansible.builtin.pip).
   - Note that the Docker SDK for Python only allows to specify the path to the Docker configuration for very few functions.
     In general, it will use C($HOME/.docker/config.json) if the C(DOCKER_CONFIG) environment variable is not specified,
     and use C($DOCKER_CONFIG/config.json) otherwise.
diff --git a/plugins/doc_fragments/mysql.py b/plugins/doc_fragments/mysql.py
index 4858d89b43..f5254064a9 100644
--- a/plugins/doc_fragments/mysql.py
+++ b/plugins/doc_fragments/mysql.py
@@ -67,9 +67,9 @@ requirements:
    - MySQLdb (Python 2.x)
 notes:
    - Requires the PyMySQL (Python 2.7 and Python 3.X) or MySQL-python (Python 2.X) package on the remote host.
-     The Python package may be installed with apt-get install python-pymysql (Ubuntu; see M(apt)) or
-     yum install python2-PyMySQL (RHEL/CentOS/Fedora; see M(yum)). You can also use dnf install python2-PyMySQL
-     for newer versions of Fedora; see M(dnf).
+     The Python package may be installed with apt-get install python-pymysql (Ubuntu; see M(ansible.builtin.apt)) or
+     yum install python2-PyMySQL (RHEL/CentOS/Fedora; see M(ansible.builtin.yum)). You can also use dnf install python2-PyMySQL
+     for newer versions of Fedora; see M(ansible.builtin.dnf).
    - Both C(login_password) and C(login_user) are required when you are
      passing credentials. If none are present, the module will attempt to read
      the credentials from C(~/.my.cnf), and finally fall back to using the MySQL
diff --git a/plugins/lookup/etcd3.py b/plugins/lookup/etcd3.py
index 5519250a70..ef7f64a99a 100644
--- a/plugins/lookup/etcd3.py
+++ b/plugins/lookup/etcd3.py
@@ -14,7 +14,7 @@ DOCUMENTATION = '''
     short_description: Get key values from etcd3 server
     description:
     - Retrieves key values and/or key prefixes from etcd3 server using its native gRPC API.
-    - Try to reuse M(etcd3) options for connection parameters, but add support for some C(ETCDCTL_*) environment variables.
+    - Try to reuse M(community.general.etcd3) options for connection parameters, but add support for some C(ETCDCTL_*) environment variables.
     - See U(https://github.com/etcd-io/etcd/tree/master/Documentation/op-guide) for etcd overview.
 
     options:
diff --git a/plugins/modules/cloud/digital_ocean/digital_ocean.py b/plugins/modules/cloud/digital_ocean/digital_ocean.py
index f661df5c2a..dd555f599f 100644
--- a/plugins/modules/cloud/digital_ocean/digital_ocean.py
+++ b/plugins/modules/cloud/digital_ocean/digital_ocean.py
@@ -15,7 +15,7 @@ short_description: Create/delete a droplet/SSH_key in DigitalOcean
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.12
   why: Updated module to remove external dependency with increased functionality.
-  alternative: Use M(digital_ocean_droplet) instead.
+  alternative: Use M(community.general.digital_ocean_droplet) instead.
 description:
      - Create/delete a droplet in DigitalOcean and optionally wait for it to be 'running', or deploy an SSH key.
 author: "Vincent Viallet (@zbal)"
diff --git a/plugins/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py b/plugins/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py
index a0bdde69d1..0701021dc9 100644
--- a/plugins/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py
+++ b/plugins/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py
@@ -15,7 +15,7 @@ module: digital_ocean_sshkey_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(digital_ocean_sshkey_info) instead.
+  alternative: Use M(community.general.digital_ocean_sshkey_info) instead.
 short_description: DigitalOcean SSH keys facts
 description:
      - Fetch DigitalOcean SSH keys facts.
diff --git a/plugins/modules/cloud/digital_ocean/digital_ocean_volume_info.py b/plugins/modules/cloud/digital_ocean/digital_ocean_volume_info.py
index 0b0f03c5aa..476233ddfd 100644
--- a/plugins/modules/cloud/digital_ocean/digital_ocean_volume_info.py
+++ b/plugins/modules/cloud/digital_ocean/digital_ocean_volume_info.py
@@ -20,7 +20,7 @@ options:
   region_name:
     description:
      - Name of region to restrict results to volumes available in a specific region.
-     - Please use M(digital_ocean_region_info) for getting valid values related regions.
+     - Please use M(community.general.digital_ocean_region_info) for getting valid values related regions.
     required: false
 
 requirements:
diff --git a/plugins/modules/cloud/docker/docker_container.py b/plugins/modules/cloud/docker/docker_container.py
index 75779aaba7..7a69d2b100 100644
--- a/plugins/modules/cloud/docker/docker_container.py
+++ b/plugins/modules/cloud/docker/docker_container.py
@@ -522,7 +522,7 @@ options:
       - List of networks the container belongs to.
       - For examples of the data structure and usage see EXAMPLES below.
       - To remove a container from one or more networks, use the I(purge_networks) option.
-      - Note that as opposed to C(docker run ...), M(docker_container) does not remove the default
+      - Note that as opposed to C(docker run ...), M(community.general.docker_container) does not remove the default
         network if I(networks) is specified. You need to explicitly use I(purge_networks) to enforce
         the removal of the default network (and all other networks not explicitly mentioned in I(networks)).
         Alternatively, use the I(networks_cli_compatible) option, which will be enabled by default from community.general 2.0.0 on.
diff --git a/plugins/modules/cloud/docker/docker_container_info.py b/plugins/modules/cloud/docker/docker_container_info.py
index ea31da417d..8cdf8bae96 100644
--- a/plugins/modules/cloud/docker/docker_container_info.py
+++ b/plugins/modules/cloud/docker/docker_container_info.py
@@ -15,7 +15,7 @@ short_description: Retrieves facts about docker container
 
 description:
   - Retrieves facts about a docker container.
-  - Essentially returns the output of C(docker inspect <name>), similar to what M(docker_container)
+  - Essentially returns the output of C(docker inspect <name>), similar to what M(community.general.docker_container)
     returns for a non-absent container.
 
 
diff --git a/plugins/modules/cloud/docker/docker_image_info.py b/plugins/modules/cloud/docker/docker_image_info.py
index 5d7afe230b..0e06b976ae 100644
--- a/plugins/modules/cloud/docker/docker_image_info.py
+++ b/plugins/modules/cloud/docker/docker_image_info.py
@@ -19,7 +19,7 @@ description:
      - If an image does not exist locally, it will not appear in the results. If you want to check whether an image exists
        locally, you can call the module with the image name, then check whether the result list is empty (image does not
        exist) or has one element (the image exists locally).
-     - The module will not attempt to pull images from registries. Use M(docker_image) with I(source) set to C(pull)
+     - The module will not attempt to pull images from registries. Use M(community.general.docker_image) with I(source) set to C(pull)
        to ensure an image is pulled.
 
 notes:
diff --git a/plugins/modules/cloud/docker/docker_network.py b/plugins/modules/cloud/docker/docker_network.py
index 957efcc579..afac9e3058 100644
--- a/plugins/modules/cloud/docker/docker_network.py
+++ b/plugins/modules/cloud/docker/docker_network.py
@@ -27,7 +27,7 @@ options:
       - List of container names or container IDs to connect to a network.
       - Please note that the module only makes sure that these containers are connected to the network,
         but does not care about connection options. If you rely on specific IP addresses etc., use the
-        M(docker_container) module to ensure your containers are correctly connected to this network.
+        M(community.general.docker_container) module to ensure your containers are correctly connected to this network.
     type: list
     elements: str
     aliases:
@@ -180,7 +180,7 @@ notes:
   - When network options are changed, the module disconnects all containers from the network, deletes the network, and re-creates the network.
     It does not try to reconnect containers, except the ones listed in (I(connected), and even for these, it does not consider specific
     connection options like fixed IP addresses or MAC addresses. If you need more control over how the containers are connected to the
-    network, loop the M(docker_container) module to loop over your containers to make sure they are connected properly.
+    network, loop the M(community.general.docker_container) module to loop over your containers to make sure they are connected properly.
   - The module does not support Docker Swarm, i.e. it will not try to disconnect or reconnect services. If services are connected to the
     network, deleting the network will fail. When network options are changed, the network has to be deleted and recreated, so this will
     fail as well.
diff --git a/plugins/modules/cloud/docker/docker_network_info.py b/plugins/modules/cloud/docker/docker_network_info.py
index e30c8080cc..89ac772e18 100644
--- a/plugins/modules/cloud/docker/docker_network_info.py
+++ b/plugins/modules/cloud/docker/docker_network_info.py
@@ -15,7 +15,7 @@ short_description: Retrieves facts about docker network
 
 description:
   - Retrieves facts about a docker network.
-  - Essentially returns the output of C(docker network inspect <name>), similar to what M(docker_network)
+  - Essentially returns the output of C(docker network inspect <name>), similar to what M(community.general.docker_network)
     returns for a non-absent network.
 
 
diff --git a/plugins/modules/cloud/docker/docker_node.py b/plugins/modules/cloud/docker/docker_node.py
index b51d5249db..f10d906da8 100644
--- a/plugins/modules/cloud/docker/docker_node.py
+++ b/plugins/modules/cloud/docker/docker_node.py
@@ -26,7 +26,7 @@ options:
         description:
             - User-defined key/value metadata that will be assigned as node attribute.
             - Label operations in this module apply to the docker swarm node specified by I(hostname).
-              Use M(docker_swarm) module to add/modify/remove swarm cluster labels.
+              Use M(community.general.docker_swarm) module to add/modify/remove swarm cluster labels.
             - The actual state of labels assigned to the node when module completes its work depends on
               I(labels_state) and I(labels_to_remove) parameters values. See description below.
         type: dict
diff --git a/plugins/modules/cloud/docker/docker_swarm.py b/plugins/modules/cloud/docker/docker_swarm.py
index dfadbf02e5..b893076bab 100644
--- a/plugins/modules/cloud/docker/docker_swarm.py
+++ b/plugins/modules/cloud/docker/docker_swarm.py
@@ -139,7 +139,7 @@ options:
     description:
       - User-defined key/value metadata.
       - Label operations in this module apply to the docker swarm cluster.
-        Use M(docker_node) module to add/modify/remove swarm node labels.
+        Use M(community.general.docker_node) module to add/modify/remove swarm node labels.
       - Requires API version >= 1.32.
     type: dict
   signing_ca_cert:
@@ -165,7 +165,7 @@ options:
     description:
       - If set, generate a key and use it to lock data stored on the managers.
       - Docker default value is C(no).
-      - M(docker_swarm_info) can be used to retrieve the unlock key.
+      - M(community.general.docker_swarm_info) can be used to retrieve the unlock key.
     type: bool
   rotate_worker_token:
     description: Rotate the worker join token.
diff --git a/plugins/modules/cloud/google/gcdns_record.py b/plugins/modules/cloud/google/gcdns_record.py
index e3c125b53b..5b0b87e6c7 100644
--- a/plugins/modules/cloud/google/gcdns_record.py
+++ b/plugins/modules/cloud/google/gcdns_record.py
@@ -25,7 +25,7 @@ requirements:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_dns_resource_record_set) instead.
+    alternative: Use M(google.cloud.gcp_dns_resource_record_set) instead.
 options:
     state:
         description:
@@ -116,7 +116,7 @@ options:
         description:
             - The Google Cloud Platform project ID to use.
 notes:
-    - See also M(gcdns_zone).
+    - See also M(community.general.gcdns_zone).
     - This modules's underlying library does not support in-place updates for
       DNS resource records. Instead, resource records are quickly deleted and
       recreated.
diff --git a/plugins/modules/cloud/google/gcdns_zone.py b/plugins/modules/cloud/google/gcdns_zone.py
index f4742220a7..33044be9e9 100644
--- a/plugins/modules/cloud/google/gcdns_zone.py
+++ b/plugins/modules/cloud/google/gcdns_zone.py
@@ -24,7 +24,7 @@ requirements:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_dns_managed_zone) instead.
+    alternative: Use M(google.cloud.gcp_dns_managed_zone) instead.
 options:
     state:
         description:
@@ -61,7 +61,7 @@ options:
         description:
             - The Google Cloud Platform project ID to use.
 notes:
-    - See also M(gcdns_record).
+    - See also M(community.general.gcdns_record).
     - Zones that are newly created must still be set up with a domain registrar
       before they can be used.
 '''
diff --git a/plugins/modules/cloud/google/gce.py b/plugins/modules/cloud/google/gce.py
index 8665f0812a..82499a1fa1 100644
--- a/plugins/modules/cloud/google/gce.py
+++ b/plugins/modules/cloud/google/gce.py
@@ -18,7 +18,7 @@ description:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_compute_instance) instead.
+    alternative: Use M(google.cloud.gcp_compute_instance) instead.
 options:
   image:
     description:
diff --git a/plugins/modules/cloud/google/gcp_target_proxy.py b/plugins/modules/cloud/google/gcp_target_proxy.py
index 63beb256cc..8c475f6057 100644
--- a/plugins/modules/cloud/google/gcp_target_proxy.py
+++ b/plugins/modules/cloud/google/gcp_target_proxy.py
@@ -23,7 +23,7 @@ requirements:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_compute_target_http_proxy) instead.
+    alternative: Use M(google.cloud.gcp_compute_target_http_proxy) instead.
 notes:
   - Currently only supports global HTTP proxy.
 author:
diff --git a/plugins/modules/cloud/google/gcp_url_map.py b/plugins/modules/cloud/google/gcp_url_map.py
index 0b19d58a1a..58458dab03 100644
--- a/plugins/modules/cloud/google/gcp_url_map.py
+++ b/plugins/modules/cloud/google/gcp_url_map.py
@@ -28,7 +28,7 @@ author:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_compute_url_map) instead.
+    alternative: Use M(google.cloud.gcp_compute_url_map) instead.
 options:
   url_map_name:
     description:
diff --git a/plugins/modules/cloud/google/gcspanner.py b/plugins/modules/cloud/google/gcspanner.py
index 3310097319..288519c158 100644
--- a/plugins/modules/cloud/google/gcspanner.py
+++ b/plugins/modules/cloud/google/gcspanner.py
@@ -23,7 +23,7 @@ notes:
 deprecated:
     removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
-    alternative: Use M(gcp_spanner_database) and/or M(gcp_spanner_instance) instead.
+    alternative: Use M(google.cloud.gcp_spanner_database) and/or M(google.cloud.gcp_spanner_instance) instead.
 author:
   - Tom Melendez (@supertom) <tom@supertom.com>
 options:
diff --git a/plugins/modules/cloud/kubevirt/kubevirt_pvc.py b/plugins/modules/cloud/kubevirt/kubevirt_pvc.py
index c36531e105..44980f076d 100644
--- a/plugins/modules/cloud/kubevirt/kubevirt_pvc.py
+++ b/plugins/modules/cloud/kubevirt/kubevirt_pvc.py
@@ -115,7 +115,7 @@ options:
       - "If data is to be copied onto the PVC using the Containerized Data Importer you can specify the source of
         the data (along with any additional configuration) as well as it's format."
       - "Valid source types are: blank, http, s3, registry, pvc and upload. The last one requires using the
-        M(kubevirt_cdi_upload) module to actually perform an upload."
+        M(community.general.kubevirt_cdi_upload) module to actually perform an upload."
       - "Source data format is specified using the optional I(content_type). Valid options are C(kubevirt)
         (default; raw image) and C(archive) (tar.gz)."
       - "This uses the DataVolume source syntax:
diff --git a/plugins/modules/cloud/kubevirt/kubevirt_template.py b/plugins/modules/cloud/kubevirt/kubevirt_template.py
index 341f419422..0f9c75a546 100644
--- a/plugins/modules/cloud/kubevirt/kubevirt_template.py
+++ b/plugins/modules/cloud/kubevirt/kubevirt_template.py
@@ -38,7 +38,7 @@ options:
               The definition of these objects can reference parameters defined earlier.
             - As part of the list user can pass also I(VirtualMachine) kind. When passing I(VirtualMachine)
               user must use Ansible structure of the parameters not the Kubernetes API structure. For more information
-              please take a look at M(kubevirt_vm) module and at EXAMPLES section, where you can see example.
+              please take a look at M(community.general.kubevirt_vm) module and at EXAMPLES section, where you can see example.
         type: list
     merge_type:
         description:
diff --git a/plugins/modules/cloud/lxd/lxd_container.py b/plugins/modules/cloud/lxd/lxd_container.py
index 7425776615..6ef97fd889 100644
--- a/plugins/modules/cloud/lxd/lxd_container.py
+++ b/plugins/modules/cloud/lxd/lxd_container.py
@@ -136,7 +136,7 @@ notes:
     2.1, the later requires python to be installed in the container which can
     be done with the command module.
   - You can copy a file from the host to the container
-    with the Ansible M(copy) and M(template) module and the `lxd` connection plugin.
+    with the Ansible M(ansible.builtin.copy) and M(ansible.builtin.template) module and the `lxd` connection plugin.
     See the example below.
   - You can copy a file in the created container to the localhost
     with `command=lxc file pull container_name/dir/filename filename`.
diff --git a/plugins/modules/cloud/misc/helm.py b/plugins/modules/cloud/misc/helm.py
index ff5c04af09..fbf0580fe6 100644
--- a/plugins/modules/cloud/misc/helm.py
+++ b/plugins/modules/cloud/misc/helm.py
@@ -12,7 +12,7 @@ DOCUMENTATION = '''
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.14
   why: For more details https://github.com/ansible/ansible/issues/61546.
-  alternative: Use M(helm) in the community.kubernetes collection instead.
+  alternative: Use M(community.kubernetes.helm) instead.
 module: helm
 short_description: Manages Kubernetes packages with the Helm package manager
 author: "Flavio Percoco (@flaper87)"
diff --git a/plugins/modules/cloud/misc/ovirt.py b/plugins/modules/cloud/misc/ovirt.py
index 5630d3f6b1..f43f0bdd8e 100644
--- a/plugins/modules/cloud/misc/ovirt.py
+++ b/plugins/modules/cloud/misc/ovirt.py
@@ -17,7 +17,7 @@ deprecated:
     why: This module is for deprecated version of ovirt.
     alternative: Use C(ovirt_vm) from the C(ovirt.ovirt) collection instead
 description:
-    - This module only supports oVirt/RHEV version 3. A newer module M(ovirt_vm) supports oVirt/RHV version 4.
+    - This module only supports oVirt/RHEV version 3. A newer module M(ovirt.ovirt.ovirt_vm) supports oVirt/RHV version 4.
     - Allows you to create new instances, either from scratch or an image, in addition to deleting or stopping instances on the oVirt/RHEV platform.
 options:
   user:
diff --git a/plugins/modules/cloud/misc/rhevm.py b/plugins/modules/cloud/misc/rhevm.py
index 59db86e286..7bbc1dffac 100644
--- a/plugins/modules/cloud/misc/rhevm.py
+++ b/plugins/modules/cloud/misc/rhevm.py
@@ -13,7 +13,7 @@ module: rhevm
 short_description: RHEV/oVirt automation
 description:
     - This module only supports oVirt/RHEV version 3.
-    - A newer module M(ovirt_vm) supports oVirt/RHV version 4.
+    - A newer module M(ovirt.ovirt.ovirt_vm) supports oVirt/RHV version 4.
     - Allows you to create/remove/update or powermanage virtual machines on a RHEV/oVirt platform.
 requirements:
     - ovirtsdk
diff --git a/plugins/modules/cloud/online/online_server_facts.py b/plugins/modules/cloud/online/online_server_facts.py
index 0804177ad5..a54b972076 100644
--- a/plugins/modules/cloud/online/online_server_facts.py
+++ b/plugins/modules/cloud/online/online_server_facts.py
@@ -13,7 +13,7 @@ module: online_server_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(online_server_info) instead.
+  alternative: Use M(community.general.online_server_info) instead.
 short_description: Gather facts about Online servers.
 description:
   - Gather facts about the servers.
diff --git a/plugins/modules/cloud/online/online_user_facts.py b/plugins/modules/cloud/online/online_user_facts.py
index a8c0acf503..5892450190 100644
--- a/plugins/modules/cloud/online/online_user_facts.py
+++ b/plugins/modules/cloud/online/online_user_facts.py
@@ -12,7 +12,7 @@ module: online_user_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(online_user_info) instead.
+  alternative: Use M(community.general.online_user_info) instead.
 short_description: Gather facts about Online user.
 description:
   - Gather facts about the user.
diff --git a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
index e033cf2202..2d50323ac9 100644
--- a/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_affinity_label_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_affinity_label_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_affinity_label_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV affinity labels."
-    - This module was called C(ovirt_affinity_label_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_affinity_label_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_affinity_labels), which
        contains a list of affinity labels. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_api_facts.py b/plugins/modules/cloud/ovirt/ovirt_api_facts.py
index 6d07f55642..f09f2804af 100644
--- a/plugins/modules/cloud/ovirt/ovirt_api_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_api_facts.py
@@ -15,11 +15,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_api_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_api_info) instead.
 description:
     - "Retrieve information about the oVirt/RHV API."
-    - This module was called C(ovirt_api_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_api_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_api),
        which contains a information about oVirt/RHV API. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
index ee93bd9942..f1206780c9 100644
--- a/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_cluster_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_cluster_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_cluster_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV clusters."
-    - This module was called C(ovirt_cluster_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_cluster_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_clusters), which
        contains a list of clusters. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
index 5ef7c7c571..5b01d50a42 100644
--- a/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_datacenter_facts.py
@@ -15,11 +15,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_datacenter_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_datacenter_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV datacenters."
-    - This module was called C(ovirt_datacenter_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_datacenter_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_datacenters), which
        contains a list of datacenters. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
index e16ca2f439..04532a17e5 100644
--- a/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_disk_facts.py
@@ -30,11 +30,9 @@ author: "Katerina Koukiou (@KKoukiou)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_disk_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_disk_info) instead
 description:
     - "Retrieve information about one or more oVirt/RHV disks."
-    - This module was called C(ovirt_disk_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_disk_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_disks), which
        contains a list of disks. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_event_facts.py b/plugins/modules/cloud/ovirt/ovirt_event_facts.py
index 80cf234262..e846a2262f 100644
--- a/plugins/modules/cloud/ovirt/ovirt_event_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_event_facts.py
@@ -14,11 +14,9 @@ author: "Chris Keller (@nasx)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_event_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_event_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV events."
-    - This module was called C(ovirt_event_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_event_info) module no longer returns C(ansible_facts)!
 options:
     case_sensitive:
         description:
diff --git a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
index 9d6dc95c7d..b67325444b 100644
--- a/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_external_provider_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_external_provider_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_external_provider_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV external providers."
-    - This module was called C(ovirt_external_provider_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_external_provider_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_external_providers), which
        contains a list of external_providers. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_group_facts.py b/plugins/modules/cloud/ovirt/ovirt_group_facts.py
index 0e589171f3..8f06b7bd64 100644
--- a/plugins/modules/cloud/ovirt/ovirt_group_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_group_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_group_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_group_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV groups."
-    - This module was called C(ovirt_group_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_group_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_groups), which
        contains a list of groups. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_host_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_facts.py
index 80736273a0..b57bb995a3 100644
--- a/plugins/modules/cloud/ovirt/ovirt_host_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_host_facts.py
@@ -15,11 +15,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_host_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_host_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV hosts."
-    - This module was called C(ovirt_host_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_host_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_hosts), which
        contains a list of hosts. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
index 29a80c9c6d..a14dceac22 100644
--- a/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_host_storage_facts.py
@@ -15,11 +15,9 @@ author: "Daniel Erez (@derez)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_host_storage_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_host_storage_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV HostStorages (applicable only for block storage)."
-    - This module was called C(ovirt_host_storage_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_host_storage_info) module no longer returns C(ansible_facts)!
 options:
     host:
         description:
diff --git a/plugins/modules/cloud/ovirt/ovirt_network_facts.py b/plugins/modules/cloud/ovirt/ovirt_network_facts.py
index a8b8dac8bf..9ca95e3c7e 100644
--- a/plugins/modules/cloud/ovirt/ovirt_network_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_network_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_network_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_network_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV networks."
-    - This module was called C(ovirt_network_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_network_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_networks), which
        contains a list of networks. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
index a3abfaa303..d289ab533c 100644
--- a/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_nic_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_nic_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_nic_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV virtual machine network interfaces."
-    - This module was called C(ovirt_nic_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_nic_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_nics), which
        contains a list of NICs. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
index 2987159fb4..ea3a7017b6 100644
--- a/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_permission_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_permission_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_permission_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV permissions."
-    - This module was called C(ovirt_permission_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_permission_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_permissions), which
        contains a list of permissions. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
index 9f18c8e6d9..97aca41a11 100644
--- a/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_quota_facts.py
@@ -30,11 +30,9 @@ author: "Maor Lipchuk (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_quota_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_quota_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV quotas."
-    - This module was called C(ovirt_quota_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_quota_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_quotas), which
        contains a list of quotas. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
index f1fcb1729b..546b8e62b7 100644
--- a/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_scheduling_policy_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_scheduling_policy_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_scheduling_policy_info) instead.
 description:
     - "Retrieve information about one or more oVirt scheduling policies."
-    - This module was called C(ovirt_scheduling_policy_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_scheduling_policy_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_scheduling_policies),
        which contains a list of scheduling policies. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
index d4d2a1af1a..82f68a9379 100644
--- a/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_snapshot_facts.py
@@ -15,11 +15,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_snapshot_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_snapshot_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV virtual machine snapshots."
-    - This module was called C(ovirt_snapshot_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_snapshot_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_snapshots), which
        contains a list of snapshots. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
index e3d782f861..9fca203dc4 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_domain_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_storage_domain_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_storage_domain_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV storage domains."
-    - This module was called C(ovirt_storage_domain_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_storage_domain_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_storage_domains), which
        contains a list of storage domains. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
index 9d4fd93e13..d0668d4b94 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_template_facts.py
@@ -30,11 +30,9 @@ author: "Maor Lipchuk (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_storage_template_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_storage_template_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV templates relate to a storage domain."
-    - This module was called C(ovirt_storage_template_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_storage_template_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_storage_templates), which
        contains a list of templates. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
index c06e5bea57..539a64bba4 100644
--- a/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_storage_vm_facts.py
@@ -30,11 +30,9 @@ author: "Maor Lipchuk (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_storage_vm_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_storage_vm_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV virtual machines relate to a storage domain."
-    - This module was called C(ovirt_storage_vm_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_storage_vm_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_storage_vms), which
        contains a list of virtual machines. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
index d00839e33a..de08f6c35a 100644
--- a/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_tag_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_tag_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_tag_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV tags."
-    - This module was called C(ovirt_tag_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_tag_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_tags), which
        contains a list of tags. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_template_facts.py b/plugins/modules/cloud/ovirt/ovirt_template_facts.py
index 4a60156662..8dc9187185 100644
--- a/plugins/modules/cloud/ovirt/ovirt_template_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_template_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_template_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_template_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV templates."
-    - This module was called C(ovirt_template_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_template_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_templates), which
        contains a list of templates. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_user_facts.py b/plugins/modules/cloud/ovirt/ovirt_user_facts.py
index 8ebafbfeaf..dd2a9f5b0d 100644
--- a/plugins/modules/cloud/ovirt/ovirt_user_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_user_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_user_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_user_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV users."
-    - This module was called C(ovirt_user_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_user_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_users), which
        contains a list of users. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
index 7292cb47ae..f162633d38 100644
--- a/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_vm_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_vm_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_vm_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV virtual machines."
-    - This module was called C(ovirt_vm_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_vm_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_vms), which
        contains a list of virtual machines. You need to register the result with
diff --git a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
index e6c0fc0e63..3dd8901f04 100644
--- a/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
+++ b/plugins/modules/cloud/ovirt/ovirt_vmpool_facts.py
@@ -30,11 +30,9 @@ author: "Ondra Machacek (@machacekondra)"
 deprecated:
     removed_in: 3.0.0  # was Ansible 2.13
     why: When migrating to collection we decided to use only _info modules.
-    alternative: Use C(ovirt_vmpool_info) from the C(ovirt.ovirt) collection instead
+    alternative: Use M(ovirt.ovirt.ovirt_vmpool_info) instead.
 description:
     - "Retrieve information about one or more oVirt/RHV vmpools."
-    - This module was called C(ovirt_vmpool_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(ovirt_vmpool_info) module no longer returns C(ansible_facts)!
 notes:
     - "This module returns a variable C(ovirt_vmpools), which
        contains a list of vmpools. You need to register the result with
diff --git a/plugins/modules/cloud/scaleway/scaleway_image_facts.py b/plugins/modules/cloud/scaleway/scaleway_image_facts.py
index b54f9a0ab2..5291290b5b 100644
--- a/plugins/modules/cloud/scaleway/scaleway_image_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_image_facts.py
@@ -13,7 +13,7 @@ module: scaleway_image_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_image_info) instead.
+  alternative: Use M(community.general.scaleway_image_info) instead.
 short_description: Gather facts about the Scaleway images available.
 description:
   - Gather facts about the Scaleway images available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_ip_facts.py b/plugins/modules/cloud/scaleway/scaleway_ip_facts.py
index fbdd886887..8105fc4f0b 100644
--- a/plugins/modules/cloud/scaleway/scaleway_ip_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_ip_facts.py
@@ -13,7 +13,7 @@ module: scaleway_ip_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_ip_info) instead.
+  alternative: Use M(community.general.scaleway_ip_info) instead.
 short_description: Gather facts about the Scaleway ips available.
 description:
   - Gather facts about the Scaleway ips available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_organization_facts.py b/plugins/modules/cloud/scaleway/scaleway_organization_facts.py
index afd5f355bf..90db2df955 100644
--- a/plugins/modules/cloud/scaleway/scaleway_organization_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_organization_facts.py
@@ -13,7 +13,7 @@ module: scaleway_organization_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_organization_info) instead.
+  alternative: Use M(community.general.scaleway_organization_info) instead.
 short_description: Gather facts about the Scaleway organizations available.
 description:
   - Gather facts about the Scaleway organizations available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py b/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py
index 996c04d13d..065dad0a28 100644
--- a/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_security_group_facts.py
@@ -13,7 +13,7 @@ module: scaleway_security_group_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_security_group_info) instead.
+  alternative: Use M(community.general.scaleway_security_group_info) instead.
 short_description: Gather facts about the Scaleway security groups available.
 description:
   - Gather facts about the Scaleway security groups available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_server_facts.py b/plugins/modules/cloud/scaleway/scaleway_server_facts.py
index 473b1f4e22..cf9cdf0306 100644
--- a/plugins/modules/cloud/scaleway/scaleway_server_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_server_facts.py
@@ -13,7 +13,7 @@ module: scaleway_server_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_server_info) instead.
+  alternative: Use M(community.general.scaleway_server_info) instead.
 short_description: Gather facts about the Scaleway servers available.
 description:
   - Gather facts about the Scaleway servers available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py b/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py
index 1eb87068ec..a7bf9c0fb9 100644
--- a/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_snapshot_facts.py
@@ -13,7 +13,7 @@ module: scaleway_snapshot_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_snapshot_info) instead.
+  alternative: Use M(community.general.scaleway_snapshot_info) instead.
 short_description: Gather facts about the Scaleway snapshots available.
 description:
   - Gather facts about the Scaleway snapshot available.
diff --git a/plugins/modules/cloud/scaleway/scaleway_volume_facts.py b/plugins/modules/cloud/scaleway/scaleway_volume_facts.py
index b0af61a94f..3158484771 100644
--- a/plugins/modules/cloud/scaleway/scaleway_volume_facts.py
+++ b/plugins/modules/cloud/scaleway/scaleway_volume_facts.py
@@ -13,7 +13,7 @@ module: scaleway_volume_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(scaleway_volume_info) instead.
+  alternative: Use M(community.general.scaleway_volume_info) instead.
 short_description: Gather facts about the Scaleway volumes available.
 description:
   - Gather facts about the Scaleway volumes available.
diff --git a/plugins/modules/cloud/smartos/smartos_image_info.py b/plugins/modules/cloud/smartos/smartos_image_info.py
index e25cdbb8b7..afc09ab84a 100644
--- a/plugins/modules/cloud/smartos/smartos_image_info.py
+++ b/plugins/modules/cloud/smartos/smartos_image_info.py
@@ -15,7 +15,7 @@ short_description: Get SmartOS image details.
 description:
     - Retrieve information about all installed images on SmartOS.
     - This module was called C(smartos_image_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(smartos_image_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.smartos_image_info) module no longer returns C(ansible_facts)!
 author: Adam Števko (@xen0l)
 options:
     filters:
diff --git a/plugins/modules/database/mssql/mssql_db.py b/plugins/modules/database/mssql/mssql_db.py
index 058f64314f..844765f2cd 100644
--- a/plugins/modules/database/mssql/mssql_db.py
+++ b/plugins/modules/database/mssql/mssql_db.py
@@ -51,7 +51,7 @@ options:
     default: 'no'
 notes:
    - Requires the pymssql Python package on the remote host. For Ubuntu, this
-     is as easy as pip install pymssql (See M(pip).)
+     is as easy as pip install pymssql (See M(ansible.builtin.pip).)
 requirements:
    - python >= 2.7
    - pymssql
diff --git a/plugins/modules/database/postgresql/postgresql_membership.py b/plugins/modules/database/postgresql/postgresql_membership.py
index c74260eb61..7b5f7eee85 100644
--- a/plugins/modules/database/postgresql/postgresql_membership.py
+++ b/plugins/modules/database/postgresql/postgresql_membership.py
@@ -16,8 +16,8 @@ description:
 - Users are roles with login privilege.
 - Groups are PostgreSQL roles usually without LOGIN privilege.
 - "Common use case:"
-- 1) add a new group (groups) by M(postgresql_user) module with I(role_attr_flags=NOLOGIN)
-- 2) grant them desired privileges by M(postgresql_privs) module
+- 1) add a new group (groups) by M(community.general.postgresql_user) module with I(role_attr_flags=NOLOGIN)
+- 2) grant them desired privileges by M(community.general.postgresql_privs) module
 - 3) add desired PostgreSQL users to the new group (groups) by this module
 options:
   groups:
diff --git a/plugins/modules/database/postgresql/postgresql_pg_hba.py b/plugins/modules/database/postgresql/postgresql_pg_hba.py
index 9610eb347f..f921107ad4 100644
--- a/plugins/modules/database/postgresql/postgresql_pg_hba.py
+++ b/plugins/modules/database/postgresql/postgresql_pg_hba.py
@@ -105,7 +105,7 @@ notes:
      This could give unexpected results with manual created hba files, if it was improperly sorted.
      For example a rule was created for a net first and for a ip in that net range next.
      In that situation, the 'ip specific rule' will never hit, it is in the C(pg_hba) file obsolete.
-     After the C(pg_hba) file is rewritten by the M(postgresql_pg_hba) module, the ip specific rule will be sorted above the range rule.
+     After the C(pg_hba) file is rewritten by the M(community.general.postgresql_pg_hba) module, the ip specific rule will be sorted above the range rule.
      And then it will hit, which will give unexpected results.
    - With the 'order' parameter you can control which field is used to sort first, next and last.
    - The module supports a check mode and a diff mode.
diff --git a/plugins/modules/database/postgresql/postgresql_query.py b/plugins/modules/database/postgresql/postgresql_query.py
index 1f8073fb0e..e1442328bc 100644
--- a/plugins/modules/database/postgresql/postgresql_query.py
+++ b/plugins/modules/database/postgresql/postgresql_query.py
@@ -15,7 +15,7 @@ short_description: Run PostgreSQL queries
 description:
 - Runs arbitrary PostgreSQL queries.
 - Can run queries from SQL script files.
-- Does not run against backup files. Use M(postgresql_db) with I(state=restore)
+- Does not run against backup files. Use M(community.general.postgresql_db) with I(state=restore)
   to run queries on files made by pg_dump/pg_dumpall utilities.
 options:
   query:
diff --git a/plugins/modules/database/postgresql/postgresql_set.py b/plugins/modules/database/postgresql/postgresql_set.py
index 09bc0ed44b..88fa419782 100644
--- a/plugins/modules/database/postgresql/postgresql_set.py
+++ b/plugins/modules/database/postgresql/postgresql_set.py
@@ -21,7 +21,7 @@ description:
    - The module allows to reset parameter to boot_val (cluster initial value) by I(reset=yes) or remove parameter
      string from postgresql.auto.conf and reload I(value=default) (for settings with postmaster context restart is required).
    - After change you can see in the ansible output the previous and
-     the new parameter value and other information using returned values and M(debug) module.
+     the new parameter value and other information using returned values and M(ansible.builtin.debug) module.
 options:
   name:
     description:
diff --git a/plugins/modules/database/proxysql/proxysql_backend_servers.py b/plugins/modules/database/proxysql/proxysql_backend_servers.py
index 14faf67d6f..63c185afa1 100644
--- a/plugins/modules/database/proxysql/proxysql_backend_servers.py
+++ b/plugins/modules/database/proxysql/proxysql_backend_servers.py
@@ -12,7 +12,7 @@ module: proxysql_backend_servers
 author: "Ben Mildren (@bmildren)"
 short_description: Adds or removes mysql hosts from proxysql admin interface.
 description:
-   - The M(proxysql_backend_servers) module adds or removes mysql hosts using
+   - The M(community.general.proxysql_backend_servers) module adds or removes mysql hosts using
      the proxysql admin interface.
 options:
   hostgroup_id:
@@ -96,8 +96,9 @@ EXAMPLES = '''
 # This example adds a server, it saves the mysql server config to disk, but
 # avoids loading the mysql server config to runtime (this might be because
 # several servers are being added and the user wants to push the config to
-# runtime in a single batch using the M(proxysql_manage_config) module).  It
-# uses supplied credentials to connect to the proxysql admin interface.
+# runtime in a single batch using the community.general.proxysql_manage_config
+# module).  It uses supplied credentials to connect to the proxysql admin
+# interface.
 
 - name: Add a server
   proxysql_backend_servers:
diff --git a/plugins/modules/database/proxysql/proxysql_global_variables.py b/plugins/modules/database/proxysql/proxysql_global_variables.py
index b9ed81acb8..e60853c899 100644
--- a/plugins/modules/database/proxysql/proxysql_global_variables.py
+++ b/plugins/modules/database/proxysql/proxysql_global_variables.py
@@ -12,7 +12,7 @@ module: proxysql_global_variables
 author: "Ben Mildren (@bmildren)"
 short_description: Gets or sets the proxysql global variables.
 description:
-   - The M(proxysql_global_variables) module gets or sets the proxysql global
+   - The M(community.general.proxysql_global_variables) module gets or sets the proxysql global
      variables.
 options:
   variable:
diff --git a/plugins/modules/database/proxysql/proxysql_manage_config.py b/plugins/modules/database/proxysql/proxysql_manage_config.py
index 1ed8f83f67..1957475079 100644
--- a/plugins/modules/database/proxysql/proxysql_manage_config.py
+++ b/plugins/modules/database/proxysql/proxysql_manage_config.py
@@ -13,7 +13,7 @@ module: proxysql_manage_config
 author: "Ben Mildren (@bmildren)"
 short_description: Writes the proxysql configuration settings between layers.
 description:
-   - The M(proxysql_global_variables) module writes the proxysql configuration
+   - The M(community.general.proxysql_global_variables) module writes the proxysql configuration
      settings between layers. Currently this module will always report a
      changed state, so should typically be used with WHEN however this will
      change in a future version when the CHECKSUM table commands are available
diff --git a/plugins/modules/database/proxysql/proxysql_mysql_users.py b/plugins/modules/database/proxysql/proxysql_mysql_users.py
index 174cf34561..3c5a158bba 100644
--- a/plugins/modules/database/proxysql/proxysql_mysql_users.py
+++ b/plugins/modules/database/proxysql/proxysql_mysql_users.py
@@ -12,7 +12,7 @@ module: proxysql_mysql_users
 author: "Ben Mildren (@bmildren)"
 short_description: Adds or removes mysql users from proxysql admin interface.
 description:
-   - The M(proxysql_mysql_users) module adds or removes mysql users using the
+   - The M(community.general.proxysql_mysql_users) module adds or removes mysql users using the
      proxysql admin interface.
 options:
   username:
@@ -91,8 +91,9 @@ EXAMPLES = '''
 # This example adds a user, it saves the mysql user config to disk, but
 # avoids loading the mysql user config to runtime (this might be because
 # several users are being added and the user wants to push the config to
-# runtime in a single batch using the M(proxysql_manage_config) module).  It
-# uses supplied credentials to connect to the proxysql admin interface.
+# runtime in a single batch using the community.general.proxysql_manage_config
+# module).  It uses supplied credentials to connect to the proxysql admin
+# interface.
 
 - name: Add a user
   proxysql_mysql_users:
diff --git a/plugins/modules/database/proxysql/proxysql_query_rules.py b/plugins/modules/database/proxysql/proxysql_query_rules.py
index e5cf981ccc..7884125071 100644
--- a/plugins/modules/database/proxysql/proxysql_query_rules.py
+++ b/plugins/modules/database/proxysql/proxysql_query_rules.py
@@ -12,7 +12,7 @@ module: proxysql_query_rules
 author: "Ben Mildren (@bmildren)"
 short_description: Modifies query rules using the proxysql admin interface.
 description:
-   - The M(proxysql_query_rules) module modifies query rules using the
+   - The M(community.general.proxysql_query_rules) module modifies query rules using the
      proxysql admin interface.
 options:
   rule_id:
@@ -79,7 +79,7 @@ options:
     description:
       - Route matched queries to this hostgroup. This happens unless there is a
         started transaction and the logged in user has
-        I(transaction_persistent) set to C(True) (see M(proxysql_mysql_users)).
+        I(transaction_persistent) set to C(True) (see M(community.general.proxysql_mysql_users)).
   cache_ttl:
     description:
       - The number of milliseconds for which to cache the result of the query.
@@ -150,8 +150,8 @@ EXAMPLES = '''
 # hostgroup, it saves the mysql query rule config to disk, but avoids loading
 # the mysql query config config to runtime (this might be because several
 # rules are being added and the user wants to push the config to runtime in a
-# single batch using the M(proxysql_manage_config) module). It uses supplied
-# credentials to connect to the proxysql admin interface.
+# single batch using the community.general.proxysql_manage_config module). It
+# uses supplied credentials to connect to the proxysql admin interface.
 
 - name: Add a rule
   proxysql_query_rules:
diff --git a/plugins/modules/database/proxysql/proxysql_replication_hostgroups.py b/plugins/modules/database/proxysql/proxysql_replication_hostgroups.py
index 3d62253bad..ac9466267e 100644
--- a/plugins/modules/database/proxysql/proxysql_replication_hostgroups.py
+++ b/plugins/modules/database/proxysql/proxysql_replication_hostgroups.py
@@ -48,8 +48,8 @@ EXAMPLES = '''
 # to disk, but avoids loading the mysql server config to runtime (this might be
 # because several replication hostgroup are being added and the user wants to
 # push the config to runtime in a single batch using the
-# M(proxysql_manage_config) module).  It uses supplied credentials to connect
-# to the proxysql admin interface.
+# community.general.proxysql_manage_config module).  It uses supplied credentials
+# to connect to the proxysql admin interface.
 
 - name: Add a replication hostgroup
   proxysql_replication_hostgroups:
diff --git a/plugins/modules/database/proxysql/proxysql_scheduler.py b/plugins/modules/database/proxysql/proxysql_scheduler.py
index 0706df2080..cda16db5c5 100644
--- a/plugins/modules/database/proxysql/proxysql_scheduler.py
+++ b/plugins/modules/database/proxysql/proxysql_scheduler.py
@@ -12,7 +12,7 @@ module: proxysql_scheduler
 author: "Ben Mildren (@bmildren)"
 short_description: Adds or removes schedules from proxysql admin interface.
 description:
-   - The M(proxysql_scheduler) module adds or removes schedules using the
+   - The M(community.general.proxysql_scheduler) module adds or removes schedules using the
      proxysql admin interface.
 options:
   active:
@@ -72,8 +72,9 @@ EXAMPLES = '''
 # This example adds a schedule, it saves the scheduler config to disk, but
 # avoids loading the scheduler config to runtime (this might be because
 # several servers are being added and the user wants to push the config to
-# runtime in a single batch using the M(proxysql_manage_config) module).  It
-# uses supplied credentials to connect to the proxysql admin interface.
+# runtime in a single batch using the community.general.proxysql_manage_config
+# module).  It uses supplied credentials to connect to the proxysql admin
+# interface.
 
 - name: Add a schedule
   proxysql_scheduler:
diff --git a/plugins/modules/database/vertica/vertica_info.py b/plugins/modules/database/vertica/vertica_info.py
index 6d2c93c806..6cc33866e5 100644
--- a/plugins/modules/database/vertica/vertica_info.py
+++ b/plugins/modules/database/vertica/vertica_info.py
@@ -15,7 +15,7 @@ short_description: Gathers Vertica database facts.
 description:
   - Gathers Vertica database information.
   - This module was called C(vertica_facts) before Ansible 2.9, returning C(ansible_facts).
-    Note that the M(vertica_info) module no longer returns C(ansible_facts)!
+    Note that the M(community.general.vertica_info) module no longer returns C(ansible_facts)!
 options:
   cluster:
     description:
diff --git a/plugins/modules/files/ini_file.py b/plugins/modules/files/ini_file.py
index cf5040eb6d..98bc818d81 100644
--- a/plugins/modules/files/ini_file.py
+++ b/plugins/modules/files/ini_file.py
@@ -17,7 +17,7 @@ short_description: Tweak settings in INI files
 extends_documentation_fragment: files
 description:
      - Manage (add, remove, change) individual settings in an INI-style file without having
-       to manage the file as a whole with, say, M(template) or M(assemble).
+       to manage the file as a whole with, say, M(ansible.builtin.template) or M(ansible.builtin.assemble).
      - Adds missing sections if they don't exist.
      - Before Ansible 2.0, comments are discarded when the source file is read, and therefore will not show up in the destination file.
      - Since Ansible 2.3, this module adds missing ending newlines to files to keep in line with the POSIX standard, even when
diff --git a/plugins/modules/identity/onepassword_info.py b/plugins/modules/identity/onepassword_info.py
index eb5d9ea740..dfaef92607 100644
--- a/plugins/modules/identity/onepassword_info.py
+++ b/plugins/modules/identity/onepassword_info.py
@@ -25,11 +25,11 @@ notes:
       data could be stored in clear text on disk or in a database.
 short_description: Gather items from 1Password
 description:
-    - M(onepassword_info) wraps the C(op) command line utility to fetch data about one or more 1Password items.
+    - M(community.general.onepassword_info) wraps the C(op) command line utility to fetch data about one or more 1Password items.
     - A fatal error occurs if any of the items being searched for can not be found.
     - Recommend using with the C(no_log) option to avoid logging the values of the secrets being retrieved.
     - This module was called C(onepassword_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(onepassword_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.onepassword_info) module no longer returns C(ansible_facts)!
       You must now use the C(register) option to use the facts in other tasks.
 options:
     search_terms:
@@ -60,7 +60,8 @@ options:
     auto_login:
         type: dict
         description:
-            - A dictionary containing authentication details. If this is set, M(onepassword_info) will attempt to sign in to 1Password automatically.
+            - A dictionary containing authentication details. If this is set, M(community.general.onepassword_info)
+              will attempt to sign in to 1Password automatically.
             - Without this option, you must have already logged in via the 1Password CLI before running Ansible.
             - It is B(highly) recommended to store 1Password credentials in an Ansible Vault. Ensure that the key used to encrypt
               the Ansible Vault is equal to or greater in strength than the 1Password master password.
diff --git a/plugins/modules/net_tools/hetzner_firewall.py b/plugins/modules/net_tools/hetzner_firewall.py
index ffc8b751aa..5a3f066ae5 100644
--- a/plugins/modules/net_tools/hetzner_firewall.py
+++ b/plugins/modules/net_tools/hetzner_firewall.py
@@ -124,7 +124,7 @@ options:
         the status changes to C(active) or C(disabled).
       - Please note that there is a request limit. If you have to do multiple
         updates, it can be better to disable waiting, and regularly use
-        M(hetzner_firewall_info) to query status.
+        M(community.general.hetzner_firewall_info) to query status.
     type: bool
     default: yes
   wait_delay:
diff --git a/plugins/modules/net_tools/hetzner_firewall_info.py b/plugins/modules/net_tools/hetzner_firewall_info.py
index 2aec5d7ede..ec84d267ac 100644
--- a/plugins/modules/net_tools/hetzner_firewall_info.py
+++ b/plugins/modules/net_tools/hetzner_firewall_info.py
@@ -40,7 +40,7 @@ options:
         the status changes to C(active) or C(disabled).
       - Please note that there is a request limit. If you have to do multiple
         updates, it can be better to disable waiting, and regularly use
-        M(hetzner_firewall_info) to query status.
+        M(community.general.hetzner_firewall_info) to query status.
     type: bool
     default: yes
   wait_delay:
diff --git a/plugins/modules/net_tools/ldap/ldap_attr.py b/plugins/modules/net_tools/ldap/ldap_attr.py
index 9f6fcf4e9a..5764fd7b79 100644
--- a/plugins/modules/net_tools/ldap/ldap_attr.py
+++ b/plugins/modules/net_tools/ldap/ldap_attr.py
@@ -16,7 +16,7 @@ description:
   - Add or remove LDAP attribute values.
 notes:
   - This only deals with attributes on existing entries. To add or remove
-    whole entries, see M(ldap_entry).
+    whole entries, see M(community.general.ldap_entry).
   - The default authentication settings will attempt to use a SASL EXTERNAL
     bind over a UNIX domain socket. This works well with the default Ubuntu
     install for example, which includes a cn=peercred,cn=external,cn=auth ACL
@@ -35,7 +35,7 @@ notes:
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.14
   why: 'The current "ldap_attr" module does not support LDAP attribute insertions or deletions with objectClass dependencies.'
-  alternative: 'Use M(ldap_attrs) instead. Deprecated in community.general 0.2.0.'
+  alternative: 'Use M(community.general.ldap_attrs) instead. Deprecated in community.general 0.2.0.'
 author:
   - Jiri Tyr (@jtyr)
 requirements:
diff --git a/plugins/modules/net_tools/ldap/ldap_attrs.py b/plugins/modules/net_tools/ldap/ldap_attrs.py
index aa5b748ff7..1ecd3304c5 100644
--- a/plugins/modules/net_tools/ldap/ldap_attrs.py
+++ b/plugins/modules/net_tools/ldap/ldap_attrs.py
@@ -19,7 +19,7 @@ description:
   - Add or remove multiple LDAP attribute values.
 notes:
   - This only deals with attributes on existing entries. To add or remove
-    whole entries, see M(ldap_entry).
+    whole entries, see M(community.general.ldap_entry).
   - The default authentication settings will attempt to use a SASL EXTERNAL
     bind over a UNIX domain socket. This works well with the default Ubuntu
     install for example, which includes a cn=peercred,cn=external,cn=auth ACL
diff --git a/plugins/modules/net_tools/ldap/ldap_entry.py b/plugins/modules/net_tools/ldap/ldap_entry.py
index ee32b4aecf..8c4c31536a 100644
--- a/plugins/modules/net_tools/ldap/ldap_entry.py
+++ b/plugins/modules/net_tools/ldap/ldap_entry.py
@@ -17,7 +17,7 @@ short_description: Add or remove LDAP entries.
 description:
   - Add or remove LDAP entries. This module only asserts the existence or
     non-existence of an LDAP entry, not its attributes. To assert the
-    attribute values of an entry, see M(ldap_attr).
+    attribute values of an entry, see M(community.general.ldap_attr).
 notes:
   - The default authentication settings will attempt to use a SASL EXTERNAL
     bind over a UNIX domain socket. This works well with the default Ubuntu
@@ -37,7 +37,7 @@ options:
     description:
       - If I(state=present), attributes necessary to create an entry. Existing
         entries are never modified. To assert specific attribute values on an
-        existing entry, use M(ldap_attr) module instead.
+        existing entry, use M(community.general.ldap_attr) module instead.
   objectClass:
     description:
       - If I(state=present), value or list of values to use when creating
diff --git a/plugins/modules/net_tools/ldap/ldap_passwd.py b/plugins/modules/net_tools/ldap/ldap_passwd.py
index ca39727b68..2e529e735b 100644
--- a/plugins/modules/net_tools/ldap/ldap_passwd.py
+++ b/plugins/modules/net_tools/ldap/ldap_passwd.py
@@ -15,7 +15,7 @@ short_description: Set passwords in LDAP.
 description:
   - Set a password for an LDAP entry.  This module only asserts that
     a given password is valid for a given entry.  To assert the
-    existence of an entry, see M(ldap_entry).
+    existence of an entry, see M(community.general.ldap_entry).
 notes:
   - The default authentication settings will attempt to use a SASL EXTERNAL
     bind over a UNIX domain socket. This works well with the default Ubuntu
diff --git a/plugins/modules/notification/bearychat.py b/plugins/modules/notification/bearychat.py
index 32e5074f80..2276998d50 100644
--- a/plugins/modules/notification/bearychat.py
+++ b/plugins/modules/notification/bearychat.py
@@ -25,7 +25,7 @@ DOCUMENTATION = '''
 module: bearychat
 short_description: Send BearyChat notifications
 description:
-    - The M(bearychat) module sends notifications to U(https://bearychat.com)
+    - The M(community.general.bearychat) module sends notifications to U(https://bearychat.com)
       via the Incoming Robot integration.
 author: "Jiangge Zhang (@tonyseek)"
 options:
diff --git a/plugins/modules/notification/say.py b/plugins/modules/notification/say.py
index 5d0a237cc6..7181185a5b 100644
--- a/plugins/modules/notification/say.py
+++ b/plugins/modules/notification/say.py
@@ -15,7 +15,7 @@ short_description: Makes a computer to speak.
 description:
    - makes a computer speak! Amuse your friends, annoy your coworkers!
 notes:
-   - In 2.5, this module has been renamed from C(osx_say) to M(say).
+   - In 2.5, this module has been renamed from C(osx_say) to M(community.general.say).
    - If you like this module, you may also be interested in the osx_say callback plugin.
    - A list of available voices, with language, can be found by running C(say -v ?) on a OSX host and C(espeak --voices) on a Linux host.
 options:
diff --git a/plugins/modules/packaging/language/easy_install.py b/plugins/modules/packaging/language/easy_install.py
index 698daf2c2c..0ac32338a1 100644
--- a/plugins/modules/packaging/language/easy_install.py
+++ b/plugins/modules/packaging/language/easy_install.py
@@ -52,8 +52,8 @@ options:
 notes:
     - Please note that the C(easy_install) module can only install Python
       libraries. Thus this module is not able to remove libraries. It is
-      generally recommended to use the M(pip) module which you can first install
-      using M(easy_install).
+      generally recommended to use the M(ansible.builtin.pip) module which you can first install
+      using M(community.general.easy_install).
     - Also note that I(virtualenv) must be installed on the remote host if the
       C(virtualenv) parameter is specified.
 requirements: [ "virtualenv" ]
diff --git a/plugins/modules/packaging/os/flatpak.py b/plugins/modules/packaging/os/flatpak.py
index ea4e1e511d..150ca97db1 100644
--- a/plugins/modules/packaging/os/flatpak.py
+++ b/plugins/modules/packaging/os/flatpak.py
@@ -36,7 +36,7 @@ module: flatpak
 short_description: Manage flatpaks
 description:
 - Allows users to add or remove flatpaks.
-- See the M(flatpak_remote) module for managing flatpak remotes.
+- See the M(community.general.flatpak_remote) module for managing flatpak remotes.
 author:
 - John Kwiatkoski (@JayKayy)
 - Alexander Bethke (@oolongbrothers)
@@ -77,7 +77,7 @@ options:
     - The flatpak remote (repository) to install the flatpak from.
     - By default, C(flathub) is assumed, but you do need to add the flathub flatpak_remote before
       you can use this.
-    - See the M(flatpak_remote) module for managing flatpak remotes.
+    - See the M(community.general.flatpak_remote) module for managing flatpak remotes.
     type: str
     default: flathub
   state:
diff --git a/plugins/modules/packaging/os/flatpak_remote.py b/plugins/modules/packaging/os/flatpak_remote.py
index 030033eeed..c7b88bf7d7 100644
--- a/plugins/modules/packaging/os/flatpak_remote.py
+++ b/plugins/modules/packaging/os/flatpak_remote.py
@@ -40,7 +40,7 @@ description:
   formats.
 - Currently, remote addition is only supported via I(flatpakrepo) file URLs.
 - Existing remotes will not be updated.
-- See the M(flatpak) module for managing flatpaks.
+- See the M(community.general.flatpak) module for managing flatpaks.
 author:
 - John Kwiatkoski (@JayKayy)
 - Alexander Bethke (@oolongbrothers)
diff --git a/plugins/modules/packaging/os/pulp_repo.py b/plugins/modules/packaging/os/pulp_repo.py
index 5b9f4eb3c2..3ab911c904 100644
--- a/plugins/modules/packaging/os/pulp_repo.py
+++ b/plugins/modules/packaging/os/pulp_repo.py
@@ -28,7 +28,7 @@ options:
     type: str
   force_basic_auth:
     description:
-      - httplib2, the library used by the M(uri) module only sends
+      - httplib2, the library used by the M(ansible.builtin.uri) module only sends
         authentication information when a webservice responds to an initial
         request with a 401 status. Since some basic auth services do not
         properly send a 401, logins will fail. This option forces the sending of
diff --git a/plugins/modules/packaging/os/rhn_register.py b/plugins/modules/packaging/os/rhn_register.py
index adba9ca9d9..3f900c312c 100644
--- a/plugins/modules/packaging/os/rhn_register.py
+++ b/plugins/modules/packaging/os/rhn_register.py
@@ -16,7 +16,7 @@ description:
 author:
 - James Laska (@jlaska)
 notes:
-    - This is for older Red Hat products. You probably want the M(redhat_subscription) module instead.
+    - This is for older Red Hat products. You probably want the M(community.general.redhat_subscription) module instead.
     - In order to register a system, C(rhnreg_ks) requires either a username and password, or an activationkey.
 requirements:
     - rhnreg_ks
diff --git a/plugins/modules/packaging/os/svr4pkg.py b/plugins/modules/packaging/os/svr4pkg.py
index 9bb35866e7..13196b183f 100644
--- a/plugins/modules/packaging/os/svr4pkg.py
+++ b/plugins/modules/packaging/os/svr4pkg.py
@@ -40,7 +40,7 @@ options:
     description:
       - Specifies the location to install the package from. Required when C(state=present).
       - "Can be any path acceptable to the C(pkgadd) command's C(-d) option. e.g.: C(somefile.pkg), C(/dir/with/pkgs), C(http:/server/mypkgs.pkg)."
-      - If using a file or directory, they must already be accessible by the host. See the M(copy) module for a way to get them there.
+      - If using a file or directory, they must already be accessible by the host. See the M(ansible.builtin.copy) module for a way to get them there.
     type: str
   proxy:
     description:
diff --git a/plugins/modules/remote_management/hpilo/hpilo_info.py b/plugins/modules/remote_management/hpilo/hpilo_info.py
index f8c5f49512..595f35f2ac 100644
--- a/plugins/modules/remote_management/hpilo/hpilo_info.py
+++ b/plugins/modules/remote_management/hpilo/hpilo_info.py
@@ -19,7 +19,7 @@ description:
   for provisioning (e.g. macaddress, uuid).
 - This module requires the C(hpilo) python module.
 - This module was called C(hpilo_facts) before Ansible 2.9, returning C(ansible_facts).
-  Note that the M(hpilo_info) module no longer returns C(ansible_facts)!
+  Note that the M(community.general.hpilo_info) module no longer returns C(ansible_facts)!
 options:
   host:
     description:
diff --git a/plugins/modules/remote_management/imc/imc_rest.py b/plugins/modules/remote_management/imc/imc_rest.py
index ab53600e59..09233ee9d1 100644
--- a/plugins/modules/remote_management/imc/imc_rest.py
+++ b/plugins/modules/remote_management/imc/imc_rest.py
@@ -45,7 +45,7 @@ options:
   content:
     description:
     - When used instead of C(path), sets the content of the API requests directly.
-    - This may be convenient to template simple requests, for anything complex use the M(template) module.
+    - This may be convenient to template simple requests, for anything complex use the M(ansible.builtin.template) module.
     - You can collate multiple IMC XML fragments and they will be processed sequentially in a single stream,
       the Cisco IMC output is subsequently merged.
     - Parameter C(content) is mutual exclusive with parameter C(path).
diff --git a/plugins/modules/remote_management/oneview/oneview_datacenter_info.py b/plugins/modules/remote_management/oneview/oneview_datacenter_info.py
index c8d5574f59..bbd38456c5 100644
--- a/plugins/modules/remote_management/oneview/oneview_datacenter_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_datacenter_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve information about the OneView Data Centers
 description:
     - Retrieve information about the OneView Data Centers.
     - This module was called C(oneview_datacenter_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_datacenter_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_datacenter_info) module no longer returns C(ansible_facts)!
 requirements:
     - "hpOneView >= 2.0.1"
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_enclosure_info.py b/plugins/modules/remote_management/oneview/oneview_enclosure_info.py
index 8e85173c66..c1f33c20f4 100644
--- a/plugins/modules/remote_management/oneview/oneview_enclosure_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_enclosure_info.py
@@ -13,7 +13,7 @@ short_description: Retrieve information about one or more Enclosures
 description:
     - Retrieve information about one or more of the Enclosures from OneView.
     - This module was called C(oneview_enclosure_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_enclosure_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_enclosure_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_ethernet_network_info.py b/plugins/modules/remote_management/oneview/oneview_ethernet_network_info.py
index f13ac7d4d1..2d65e711dd 100644
--- a/plugins/modules/remote_management/oneview/oneview_ethernet_network_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_ethernet_network_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve the information about one or more of the OneView Eth
 description:
     - Retrieve the information about one or more of the Ethernet Networks from OneView.
     - This module was called C(oneview_ethernet_network_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_ethernet_network_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_ethernet_network_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_fc_network_info.py b/plugins/modules/remote_management/oneview/oneview_fc_network_info.py
index 66c8929b8c..53f178f491 100644
--- a/plugins/modules/remote_management/oneview/oneview_fc_network_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_fc_network_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve the information about one or more of the OneView Fib
 description:
     - Retrieve the information about one or more of the Fibre Channel Networks from OneView.
     - This module was called C(oneview_fc_network_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_fc_network_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_fc_network_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_fcoe_network_info.py b/plugins/modules/remote_management/oneview/oneview_fcoe_network_info.py
index 60cf7900e5..3fbed88dab 100644
--- a/plugins/modules/remote_management/oneview/oneview_fcoe_network_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_fcoe_network_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve the information about one or more of the OneView FCo
 description:
     - Retrieve the information about one or more of the FCoE Networks from OneView.
     - This module was called C(oneview_fcoe_network_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_fcoe_network_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_fcoe_network_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_logical_interconnect_group_info.py b/plugins/modules/remote_management/oneview/oneview_logical_interconnect_group_info.py
index 691881afda..94d28dff91 100644
--- a/plugins/modules/remote_management/oneview/oneview_logical_interconnect_group_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_logical_interconnect_group_info.py
@@ -13,7 +13,7 @@ short_description: Retrieve information about one or more of the OneView Logical
 description:
     - Retrieve information about one or more of the Logical Interconnect Groups from OneView
     - This module was called C(oneview_logical_interconnect_group_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_logical_interconnect_group_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_logical_interconnect_group_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_network_set_info.py b/plugins/modules/remote_management/oneview/oneview_network_set_info.py
index e5e9955369..c5e874935b 100644
--- a/plugins/modules/remote_management/oneview/oneview_network_set_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_network_set_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve information about the OneView Network Sets
 description:
     - Retrieve information about the Network Sets from OneView.
     - This module was called C(oneview_network_set_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_network_set_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_network_set_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/oneview/oneview_san_manager_info.py b/plugins/modules/remote_management/oneview/oneview_san_manager_info.py
index 0a4cb04426..17467536db 100644
--- a/plugins/modules/remote_management/oneview/oneview_san_manager_info.py
+++ b/plugins/modules/remote_management/oneview/oneview_san_manager_info.py
@@ -12,7 +12,7 @@ short_description: Retrieve information about one or more of the OneView SAN Man
 description:
     - Retrieve information about one or more of the SAN Managers from OneView
     - This module was called C(oneview_san_manager_facts) before Ansible 2.9, returning C(ansible_facts).
-      Note that the M(oneview_san_manager_info) module no longer returns C(ansible_facts)!
+      Note that the M(community.general.oneview_san_manager_info) module no longer returns C(ansible_facts)!
 requirements:
     - hpOneView >= 2.0.1
 author:
diff --git a/plugins/modules/remote_management/redfish/idrac_redfish_info.py b/plugins/modules/remote_management/redfish/idrac_redfish_info.py
index 98df77e760..e0af5c2e23 100644
--- a/plugins/modules/remote_management/redfish/idrac_redfish_info.py
+++ b/plugins/modules/remote_management/redfish/idrac_redfish_info.py
@@ -16,7 +16,7 @@ description:
     get information back.
   - For use with Dell EMC iDRAC operations that require Redfish OEM extensions
   - This module was called C(idrac_redfish_facts) before Ansible 2.9, returning C(ansible_facts).
-    Note that the M(idrac_redfish_info) module no longer returns C(ansible_facts)!
+    Note that the M(community.general.idrac_redfish_info) module no longer returns C(ansible_facts)!
 options:
   category:
     required: true
diff --git a/plugins/modules/remote_management/redfish/redfish_info.py b/plugins/modules/remote_management/redfish/redfish_info.py
index 5a65f2b86e..47af06ba03 100644
--- a/plugins/modules/remote_management/redfish/redfish_info.py
+++ b/plugins/modules/remote_management/redfish/redfish_info.py
@@ -16,7 +16,7 @@ description:
     get information back.
   - Information retrieved is placed in a location specified by the user.
   - This module was called C(redfish_facts) before Ansible 2.9, returning C(ansible_facts).
-    Note that the M(redfish_info) module no longer returns C(ansible_facts)!
+    Note that the M(community.general.redfish_info) module no longer returns C(ansible_facts)!
 options:
   category:
     required: false
diff --git a/plugins/modules/source_control/git_config.py b/plugins/modules/source_control/git_config.py
index 852437ece7..9544063782 100644
--- a/plugins/modules/source_control/git_config.py
+++ b/plugins/modules/source_control/git_config.py
@@ -20,9 +20,9 @@ requirements: ['git']
 short_description: Read and write git configuration
 description:
   - The C(git_config) module changes git configuration by invoking 'git config'.
-    This is needed if you don't want to use M(template) for the entire git
+    This is needed if you don't want to use M(ansible.builtin.template) for the entire git
     config file (e.g. because you need to change just C(user.email) in
-    /etc/.git/config).  Solutions involving M(command) are cumbersome or
+    /etc/.git/config).  Solutions involving M(ansible.builtin.command) are cumbersome or
     don't work correctly in check mode.
 options:
   list_all:
diff --git a/plugins/modules/source_control/github/github_hooks.py b/plugins/modules/source_control/github/github_hooks.py
index df53899222..6bc73e30c2 100644
--- a/plugins/modules/source_control/github/github_hooks.py
+++ b/plugins/modules/source_control/github/github_hooks.py
@@ -15,7 +15,7 @@ short_description: Manages GitHub service hooks.
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.12
   why: Replaced by more granular modules
-  alternative: Use M(github_webhook) and M(github_webhook_info) instead.
+  alternative: Use M(community.general.github_webhook) and M(community.general.github_webhook_info) instead.
 description:
      - Adds service hooks and removes service hooks that have an error status.
 options:
diff --git a/plugins/modules/storage/glusterfs/gluster_heal_info.py b/plugins/modules/storage/glusterfs/gluster_heal_info.py
index 4ee157a976..04ef234bb8 100644
--- a/plugins/modules/storage/glusterfs/gluster_heal_info.py
+++ b/plugins/modules/storage/glusterfs/gluster_heal_info.py
@@ -15,7 +15,7 @@ author: "Devyani Kota (@devyanikota)"
 description:
   - Gather facts about either self-heal or rebalance status.
   - This module was called C(gluster_heal_facts) before Ansible 2.9, returning C(ansible_facts).
-    Note that the M(gluster_heal_info) module no longer returns C(ansible_facts)!
+    Note that the M(community.general.gluster_heal_info) module no longer returns C(ansible_facts)!
 options:
   name:
     description:
diff --git a/plugins/modules/storage/netapp/na_cdot_aggregate.py b/plugins/modules/storage/netapp/na_cdot_aggregate.py
index a5e12dbb0a..d6a7da267b 100644
--- a/plugins/modules/storage/netapp/na_cdot_aggregate.py
+++ b/plugins/modules/storage/netapp/na_cdot_aggregate.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_aggregate) instead.
+  alternative: Use M(netapp.ontap.na_ontap_aggregate) instead.
 
 description:
 - Create or destroy aggregates on NetApp cDOT.
diff --git a/plugins/modules/storage/netapp/na_cdot_license.py b/plugins/modules/storage/netapp/na_cdot_license.py
index ace952c496..dccdfeab77 100644
--- a/plugins/modules/storage/netapp/na_cdot_license.py
+++ b/plugins/modules/storage/netapp/na_cdot_license.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_license) instead.
+  alternative: Use M(netapp.ontap.na_ontap_license) instead.
 
 description:
 - Add or remove licenses on NetApp ONTAP.
diff --git a/plugins/modules/storage/netapp/na_cdot_lun.py b/plugins/modules/storage/netapp/na_cdot_lun.py
index 7ef9523bba..ecfd62f513 100644
--- a/plugins/modules/storage/netapp/na_cdot_lun.py
+++ b/plugins/modules/storage/netapp/na_cdot_lun.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_lun) instead.
+  alternative: Use M(netapp.ontap.na_ontap_lun) instead.
 
 description:
 - Create, destroy, resize luns on NetApp cDOT.
diff --git a/plugins/modules/storage/netapp/na_cdot_qtree.py b/plugins/modules/storage/netapp/na_cdot_qtree.py
index 89192e965d..077290c2fa 100644
--- a/plugins/modules/storage/netapp/na_cdot_qtree.py
+++ b/plugins/modules/storage/netapp/na_cdot_qtree.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_qtree) instead.
+  alternative: Use M(netapp.ontap.na_ontap_qtree) instead.
 
 description:
 - Create or destroy Qtrees.
diff --git a/plugins/modules/storage/netapp/na_cdot_svm.py b/plugins/modules/storage/netapp/na_cdot_svm.py
index 8a8a6247f5..f4754bffe7 100644
--- a/plugins/modules/storage/netapp/na_cdot_svm.py
+++ b/plugins/modules/storage/netapp/na_cdot_svm.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_svm) instead.
+  alternative: Use M(netapp.ontap.na_ontap_svm) instead.
 
 description:
 - Create or destroy svm on NetApp cDOT
diff --git a/plugins/modules/storage/netapp/na_cdot_user.py b/plugins/modules/storage/netapp/na_cdot_user.py
index f27a66a23f..77b4dc4e23 100644
--- a/plugins/modules/storage/netapp/na_cdot_user.py
+++ b/plugins/modules/storage/netapp/na_cdot_user.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_user) instead.
+  alternative: Use M(netapp.ontap.na_ontap_user) instead.
 
 description:
 - Create or destroy users.
diff --git a/plugins/modules/storage/netapp/na_cdot_user_role.py b/plugins/modules/storage/netapp/na_cdot_user_role.py
index 3095be9a91..c575c40d6b 100644
--- a/plugins/modules/storage/netapp/na_cdot_user_role.py
+++ b/plugins/modules/storage/netapp/na_cdot_user_role.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_user_role) instead.
+  alternative: Use M(netapp.ontap.na_ontap_user_role) instead.
 
 description:
 - Create or destroy user roles
diff --git a/plugins/modules/storage/netapp/na_cdot_volume.py b/plugins/modules/storage/netapp/na_cdot_volume.py
index 6a46a02e2f..8e6c73bc0e 100644
--- a/plugins/modules/storage/netapp/na_cdot_volume.py
+++ b/plugins/modules/storage/netapp/na_cdot_volume.py
@@ -20,7 +20,7 @@ author: Sumit Kumar (@timuster) <sumit4@netapp.com>
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: Updated modules released with increased functionality
-  alternative: Use M(na_ontap_volume) instead.
+  alternative: Use M(netapp.ontap.na_ontap_volume) instead.
 
 description:
 - Create or destroy volumes on NetApp cDOT
diff --git a/plugins/modules/storage/netapp/na_ontap_gather_facts.py b/plugins/modules/storage/netapp/na_ontap_gather_facts.py
index 5cf8b7412c..765da6b9de 100644
--- a/plugins/modules/storage/netapp/na_ontap_gather_facts.py
+++ b/plugins/modules/storage/netapp/na_ontap_gather_facts.py
@@ -12,7 +12,7 @@ module: na_ontap_gather_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(na_ontap_info) instead.
+  alternative: Use M(netapp.ontap.na_ontap_info) instead.
 author: Piotr Olczak (@dprts) <polczak@redhat.com>
 extends_documentation_fragment:
 - community.general._netapp.na_ontap
diff --git a/plugins/modules/storage/netapp/sf_account_manager.py b/plugins/modules/storage/netapp/sf_account_manager.py
index b8b0853190..378da07931 100644
--- a/plugins/modules/storage/netapp/sf_account_manager.py
+++ b/plugins/modules/storage/netapp/sf_account_manager.py
@@ -13,7 +13,7 @@ module: sf_account_manager
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: This Module has been replaced
-  alternative: please use M(na_elementsw_account)
+  alternative: please use M(netapp.elementsw.na_elementsw_account)
 short_description: Manage SolidFire accounts
 extends_documentation_fragment:
 - community.general._netapp.solidfire
diff --git a/plugins/modules/storage/netapp/sf_check_connections.py b/plugins/modules/storage/netapp/sf_check_connections.py
index b5f1dd8f67..c323a2456a 100644
--- a/plugins/modules/storage/netapp/sf_check_connections.py
+++ b/plugins/modules/storage/netapp/sf_check_connections.py
@@ -13,7 +13,7 @@ module: sf_check_connections
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: This Module has been replaced
-  alternative: please use M(na_elementsw_check_connections)
+  alternative: please use M(netapp.elementsw.na_elementsw_check_connections)
 short_description: Check connectivity to MVIP and SVIP.
 extends_documentation_fragment:
 - community.general._netapp.solidfire
diff --git a/plugins/modules/storage/netapp/sf_snapshot_schedule_manager.py b/plugins/modules/storage/netapp/sf_snapshot_schedule_manager.py
index a0f86de9f6..1696d548d7 100644
--- a/plugins/modules/storage/netapp/sf_snapshot_schedule_manager.py
+++ b/plugins/modules/storage/netapp/sf_snapshot_schedule_manager.py
@@ -12,7 +12,7 @@ module: sf_snapshot_schedule_manager
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: This Module has been replaced
-  alternative: please use M(na_elementsw_snapshot_schedule)
+  alternative: please use M(netapp.elementsw.na_elementsw_snapshot_schedule)
 short_description: Manage SolidFire snapshot schedules
 extends_documentation_fragment:
 - community.general._netapp.solidfire
diff --git a/plugins/modules/storage/netapp/sf_volume_access_group_manager.py b/plugins/modules/storage/netapp/sf_volume_access_group_manager.py
index f920f78f5a..4c26bca20c 100644
--- a/plugins/modules/storage/netapp/sf_volume_access_group_manager.py
+++ b/plugins/modules/storage/netapp/sf_volume_access_group_manager.py
@@ -13,7 +13,7 @@ module: sf_volume_access_group_manager
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: This Module has been replaced
-  alternative: please use M(na_elementsw_access_group)
+  alternative: please use M(netapp.elementsw.na_elementsw_access_group)
 short_description: Manage SolidFire Volume Access Groups
 extends_documentation_fragment:
 - community.general._netapp.solidfire
diff --git a/plugins/modules/storage/netapp/sf_volume_manager.py b/plugins/modules/storage/netapp/sf_volume_manager.py
index 809999c6e8..bb2f4aabe0 100644
--- a/plugins/modules/storage/netapp/sf_volume_manager.py
+++ b/plugins/modules/storage/netapp/sf_volume_manager.py
@@ -13,7 +13,7 @@ module: sf_volume_manager
 deprecated:
   removed_in: 2.0.0  # was Ansible 2.11
   why: This Module has been replaced
-  alternative: please use M(na_elementsw_volume)
+  alternative: please use M(netapp.elementsw.na_elementsw_volume)
 short_description: Manage SolidFire volumes
 extends_documentation_fragment:
 - community.general._netapp.solidfire
diff --git a/plugins/modules/storage/purestorage/purefa_facts.py b/plugins/modules/storage/purestorage/purefa_facts.py
index 86da4b5d02..f21529bd6e 100644
--- a/plugins/modules/storage/purestorage/purefa_facts.py
+++ b/plugins/modules/storage/purestorage/purefa_facts.py
@@ -13,7 +13,7 @@ module: purefa_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favor of C(_info) module.
-  alternative: Use M(purefa_info) instead.
+  alternative: Use M(purestorage.flasharray.purefa_info) instead.
 short_description: Collect facts from Pure Storage FlashArray
 description:
   - Collect facts information from a Pure Storage Flasharray running the
diff --git a/plugins/modules/storage/purestorage/purefb_facts.py b/plugins/modules/storage/purestorage/purefb_facts.py
index b27537a799..642f3d4da2 100644
--- a/plugins/modules/storage/purestorage/purefb_facts.py
+++ b/plugins/modules/storage/purestorage/purefb_facts.py
@@ -14,7 +14,7 @@ module: purefb_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favor of C(_info) module.
-  alternative: Use M(purefb_info) instead.
+  alternative: Use M(purestorage.flashblade.purefb_info) instead.
 short_description: Collect facts from Pure Storage FlashBlade
 description:
   - Collect facts information from a Pure Storage FlashBlade running the
diff --git a/plugins/modules/system/interfaces_file.py b/plugins/modules/system/interfaces_file.py
index 1d68c010f5..bd130593e7 100644
--- a/plugins/modules/system/interfaces_file.py
+++ b/plugins/modules/system/interfaces_file.py
@@ -15,7 +15,7 @@ short_description: Tweak settings in /etc/network/interfaces files
 extends_documentation_fragment: files
 description:
      - Manage (add, remove, change) individual interface options in an interfaces-style file without having
-       to manage the file as a whole with, say, M(template) or M(assemble). Interface has to be presented in a file.
+       to manage the file as a whole with, say, M(ansible.builtin.template) or M(ansible.builtin.assemble). Interface has to be presented in a file.
      - Read information about interfaces from interfaces-styled files
 options:
   dest:
diff --git a/plugins/modules/system/ohai.py b/plugins/modules/system/ohai.py
index 6c8a17405f..64092fd15c 100644
--- a/plugins/modules/system/ohai.py
+++ b/plugins/modules/system/ohai.py
@@ -13,7 +13,7 @@ DOCUMENTATION = '''
 module: ohai
 short_description: Returns inventory data from I(Ohai)
 description:
-     - Similar to the M(facter) module, this runs the I(Ohai) discovery program
+     - Similar to the M(community.general.facter) module, this runs the I(Ohai) discovery program
        (U(https://docs.chef.io/ohai.html)) on the remote host and
        returns JSON inventory data.
        I(Ohai) data is a bit more verbose and nested than I(facter).
diff --git a/plugins/modules/system/sefcontext.py b/plugins/modules/system/sefcontext.py
index 02437f7846..33558f079a 100644
--- a/plugins/modules/system/sefcontext.py
+++ b/plugins/modules/system/sefcontext.py
@@ -69,7 +69,7 @@ options:
     default: no
 notes:
 - The changes are persistent across reboots.
-- The M(sefcontext) module does not modify existing files to the new
+- The M(community.general.sefcontext) module does not modify existing files to the new
   SELinux context(s), so it is advisable to first create the SELinux
   file contexts before creating files, or run C(restorecon) manually
   for the existing files that require the new SELinux file contexts.
diff --git a/plugins/modules/system/timezone.py b/plugins/modules/system/timezone.py
index fb2742a667..371e95efe3 100644
--- a/plugins/modules/system/timezone.py
+++ b/plugins/modules/system/timezone.py
@@ -12,7 +12,8 @@ DOCUMENTATION = r'''
 module: timezone
 short_description: Configure timezone setting
 description:
-  - This module configures the timezone setting, both of the system clock and of the hardware clock. If you want to set up the NTP, use M(service) module.
+  - This module configures the timezone setting, both of the system clock and of the hardware clock.
+    If you want to set up the NTP, use M(ansible.builtin.service) module.
   - It is recommended to restart C(crond) after changing the timezone, otherwise the jobs may run at the wrong time.
   - Several different tools are used depending on the OS/Distribution involved.
     For Linux it can use C(timedatectl) or edit C(/etc/sysconfig/clock) or C(/etc/timezone) and C(hwclock).
diff --git a/plugins/modules/web_infrastructure/deploy_helper.py b/plugins/modules/web_infrastructure/deploy_helper.py
index a763776c50..27062a1a73 100644
--- a/plugins/modules/web_infrastructure/deploy_helper.py
+++ b/plugins/modules/web_infrastructure/deploy_helper.py
@@ -46,7 +46,7 @@ options:
         C(finalize) will remove the unfinished_filename file, create a symlink to the newly
           deployed release and optionally clean old releases,
         C(clean) will remove failed & old releases,
-        C(absent) will remove the project folder (synonymous to the M(file) module with C(state=absent))
+        C(absent) will remove the project folder (synonymous to the M(ansible.builtin.file) module with C(state=absent))
     choices: [ present, finalize, absent, clean, query ]
     default: present
 
diff --git a/plugins/modules/web_infrastructure/nginx_status_facts.py b/plugins/modules/web_infrastructure/nginx_status_facts.py
index f9b34727a1..e9ce47b5f3 100644
--- a/plugins/modules/web_infrastructure/nginx_status_facts.py
+++ b/plugins/modules/web_infrastructure/nginx_status_facts.py
@@ -14,7 +14,7 @@ module: nginx_status_facts
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.13
   why: Deprecated in favour of C(_info) module.
-  alternative: Use M(nginx_status_info) instead.
+  alternative: Use M(community.general.nginx_status_info) instead.
 short_description: Retrieve nginx status facts.
 description:
   - Gathers facts from nginx from an URL having C(stub_status) enabled.