diff --git a/lib/ansible/modules/cloud/amazon/aws_kms.py b/lib/ansible/modules/cloud/amazon/aws_kms.py
index e42123429c..940a0c3239 100644
--- a/lib/ansible/modules/cloud/amazon/aws_kms.py
+++ b/lib/ansible/modules/cloud/amazon/aws_kms.py
@@ -22,7 +22,7 @@ ANSIBLE_METADATA = {
 
 DOCUMENTATION = '''
 ---
-module: kms
+module: aws_kms
 short_description: Perform various KMS management tasks.
 description:
      - Manage role/user access to a KMS key. Not designed for encrypting/decrypting.
diff --git a/lib/ansible/modules/cloud/amazon/elasticache_parameter_group.py b/lib/ansible/modules/cloud/amazon/elasticache_parameter_group.py
index 5dfe630324..96c50407c6 100644
--- a/lib/ansible/modules/cloud/amazon/elasticache_parameter_group.py
+++ b/lib/ansible/modules/cloud/amazon/elasticache_parameter_group.py
@@ -20,7 +20,7 @@ ANSIBLE_METADATA = {'status': ['preview'],
 
 DOCUMENTATION = """
 ---
-module: elasticache_group_parameter
+module: elasticache_parameter_group
 short_description: Manage cache security groups in Amazon Elasticache.
 description:
   - Manage cache security groups in Amazon Elasticache.
diff --git a/lib/ansible/modules/network/avi/avi_api_session.py b/lib/ansible/modules/network/avi/avi_api_session.py
index 8db0e7303a..8fdb51f145 100644
--- a/lib/ansible/modules/network/avi/avi_api_session.py
+++ b/lib/ansible/modules/network/avi/avi_api_session.py
@@ -27,7 +27,7 @@ ANSIBLE_METADATA = {'status': ['preview'], 'supported_by': 'community', 'version
 
 DOCUMENTATION = '''
 ---
-module: avi_api
+module: avi_api_session
 author: Gaurav Rastogi (grastogi@avinetworks.com)
 
 short_description: Avi API Module
diff --git a/lib/ansible/modules/network/fortios/fortios_config.py b/lib/ansible/modules/network/fortios/fortios_config.py
index 1db65f2ee7..26be4aec10 100644
--- a/lib/ansible/modules/network/fortios/fortios_config.py
+++ b/lib/ansible/modules/network/fortios/fortios_config.py
@@ -27,7 +27,7 @@ ANSIBLE_METADATA = {
 
 DOCUMENTATION = """
 ---
-module: fortios_address
+module: fortios_config
 version_added: "2.3"
 author: "Benjamin Jolivot (@bjolivot)"
 short_description: Manage fortios firewall config
diff --git a/lib/ansible/modules/network/ordnance/ordnance_config.py b/lib/ansible/modules/network/ordnance/ordnance_config.py
index f2291d5c5b..550a4b0173 100644
--- a/lib/ansible/modules/network/ordnance/ordnance_config.py
+++ b/lib/ansible/modules/network/ordnance/ordnance_config.py
@@ -22,7 +22,7 @@ ANSIBLE_METADATA = {'status': ['preview'],
 
 DOCUMENTATION = """
 ---
-module: Ordnance_config
+module: ordnance_config
 version_added: "2.3"
 author: "Alexander Turner (alex.turner@ordnance.io)"
 short_description: Manage Ordnance configuration sections
diff --git a/lib/ansible/modules/storage/netapp/na_cdot_user.py b/lib/ansible/modules/storage/netapp/na_cdot_user.py
index bcf89844de..b79181c424 100644
--- a/lib/ansible/modules/storage/netapp/na_cdot_user.py
+++ b/lib/ansible/modules/storage/netapp/na_cdot_user.py
@@ -23,7 +23,7 @@ ANSIBLE_METADATA = {'status': ['preview'],
 
 DOCUMENTATION = '''
 
-module: na_cdot_users
+module: na_cdot_user
 
 short_description: useradmin configuration and management
 extends_documentation_fragment: