diff --git a/lib/ansible/modules/storage/netapp/na_elementsw_drive.py b/lib/ansible/modules/storage/netapp/na_elementsw_drive.py
index 4f89ffd64af..e1dee536bde 100644
--- a/lib/ansible/modules/storage/netapp/na_elementsw_drive.py
+++ b/lib/ansible/modules/storage/netapp/na_elementsw_drive.py
@@ -19,7 +19,7 @@ DOCUMENTATION = '''
 
 module: na_elementsw_drive
 
-short_description: NetApp Element Software ManageNetApp Element Software Node Drives
+short_description: NetApp Element Software Manage Node Drives
 extends_documentation_fragment:
     - netapp.solidfire
 version_added: '2.7'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_aggregate.py b/lib/ansible/modules/storage/netapp/na_ontap_aggregate.py
index cb954827492..e69d709d3e5 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_aggregate.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_aggregate.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_aggregate
 
-short_description: Manage NetApp ONTAP aggregates.
+short_description: NetApp ONTAP manage aggregates.
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_autosupport.py b/lib/ansible/modules/storage/netapp/na_ontap_autosupport.py
index db0a524b685..b94403c9e20 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_autosupport.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_autosupport.py
@@ -50,7 +50,7 @@ options:
     description:
       - Specifies whether AutoSupport notification to technical support is enabled.
     type: bool
-short_description: "Manage NetApp Autosupport"
+short_description: "NetApp ONTAP manage Autosupport"
 version_added: "2.7"
 
 """
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain.py b/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain.py
index bbcadc7ff27..3dd41afe826 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain.py
@@ -13,7 +13,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_broadcast_domain
-short_description: Manage NetApp ONTAP broadcast domains.
+short_description: NetApp ONTAP manage broadcast domains..
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain_ports.py b/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain_ports.py
index 6cf5630cbb5..1127d42a9d8 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain_ports.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_broadcast_domain_ports.py
@@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_broadcast_domain_ports
-short_description: Manage NetApp ONTAP broadcast domain ports
+short_description: NetApp ONTAP manage broadcast domain ports
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py b/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py
index 704201de90c..2c1b1e101de 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cg_snapshot.py
@@ -11,7 +11,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'supported_by': 'community'}
 
 DOCUMENTATION = '''
-short_description: Create consistency group snapshot
+short_description: NetApp ONTAP manage consistency group snapshot
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
   - Create consistency group snapshot for ONTAP volumes.
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cifs.py b/lib/ansible/modules/storage/netapp/na_ontap_cifs.py
index b46769fb1da..b7d77a39dbc 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cifs.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cifs.py
@@ -40,7 +40,7 @@ options:
       - "Whether the specified CIFS share should exist or not."
     required: false
     default: present
-short_description: "Manage NetApp cifs-share"
+short_description: "NetApp ONTAP manage cifs-share"
 version_added: "2.6"
 
 '''
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py b/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py
index 4399b9aac98..3e63561b987 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cifs_acl.py
@@ -40,7 +40,7 @@ options:
     description:
       - "The user or group name for which the permissions are listed."
     required: true
-short_description: "Manage NetApp cifs-share-access-control"
+short_description: "NetApp ONTAP manage cifs-share-access-control"
 version_added: "2.6"
 
 '''
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py b/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py
index be15d019f32..b00ef7d0830 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cifs_server.py
@@ -17,14 +17,14 @@ ANSIBLE_METADATA = {
 DOCUMENTATION = '''
 ---
 module: na_ontap_cifs_server
-short_description: cifs server configuration
+short_description: NetApp ONTAP CIFS server configuration
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 
 description:
-    - Creating / deleting and modifying the CIF server .
+    - Creating / deleting and modifying the CIFS server.
 
 options:
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cluster.py b/lib/ansible/modules/storage/netapp/na_ontap_cluster.py
index 9451bfd62fd..754e2bf80a5 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cluster.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cluster.py
@@ -13,7 +13,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_cluster
-short_description: Create/Join ONTAP cluster. Apply license to cluster
+short_description: NetApp ONTAP cluster - create, join, add license
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cluster_ha.py b/lib/ansible/modules/storage/netapp/na_ontap_cluster_ha.py
index 22e6bcd5767..603c84b7784 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cluster_ha.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cluster_ha.py
@@ -24,7 +24,7 @@ options:
     description:
       - "Whether HA on cluster should be enabled or disabled."
     default: present
-short_description: "Manage HA status for cluster"
+short_description: NetApp ONTAP Manage HA status for cluster
 version_added: "2.6"
 '''
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_cluster_peer.py b/lib/ansible/modules/storage/netapp/na_ontap_cluster_peer.py
index f588e8fc907..a3002ed7d32 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_cluster_peer.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_cluster_peer.py
@@ -52,7 +52,7 @@ options:
     description:
      - Destination password.
      - Optional if this is same as source password.
-short_description: "NetApp ONTAP Manage Cluster peering"
+short_description: NetApp ONTAP Manage Cluster peering
 version_added: "2.7"
 '''
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_export_policy.py b/lib/ansible/modules/storage/netapp/na_ontap_export_policy.py
index 7f6ba546fc6..bac1fd5b797 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_export_policy.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_export_policy.py
@@ -13,7 +13,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_export_policy
-short_description: Manage NetApp ONTAP export-policy
+short_description: NetApp ONTAP manage export-policy
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_export_policy_rule.py b/lib/ansible/modules/storage/netapp/na_ontap_export_policy_rule.py
index cf0317c3591..f52eae1c3f1 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_export_policy_rule.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_export_policy_rule.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_export_policy_rule
 
-short_description: Manage ONTAP Export rules
+short_description: NetApp ONTAP manage export policy rules
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_igroup.py b/lib/ansible/modules/storage/netapp/na_ontap_igroup.py
index 19b4603df9a..b60bd578dbf 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_igroup.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_igroup.py
@@ -17,7 +17,7 @@ ANSIBLE_METADATA = {
 DOCUMENTATION = '''
 
 module: na_ontap_igroup
-short_description: ONTAP iSCSI igroup configuration
+short_description: NetApp ONTAP iSCSI igroup configuration
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_interface.py b/lib/ansible/modules/storage/netapp/na_ontap_interface.py
index 7fc0b793d8e..6dabf107862 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_interface.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_interface.py
@@ -18,7 +18,7 @@ DOCUMENTATION = '''
 ---
 
 module: na_ontap_interface
-short_description: ONTAP LIF configuration
+short_description: NetApp ONTAP LIF configuration
 
 extends_documentation_fragment:
     - netapp.na_ontap
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_iscsi.py b/lib/ansible/modules/storage/netapp/na_ontap_iscsi.py
index 7c9e11abd34..549cd38d0b8 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_iscsi.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_iscsi.py
@@ -17,14 +17,14 @@ DOCUMENTATION = '''
 
 module: na_ontap_iscsi
 
-short_description: Manage NetApp ONTAP iscsi service
+short_description: NetApp ONTAP manage iSCSI service
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 
 description:
-- create, delete, start, stop iscsi service on svm.
+- create, delete, start, stop iSCSI service on SVM.
 
 options:
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_job_schedule.py b/lib/ansible/modules/storage/netapp/na_ontap_job_schedule.py
index 992ea60deda..b5df3fce5e6 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_job_schedule.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_job_schedule.py
@@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_job_schedule
-short_description: Manage NetApp ONTAP Job Schedule
+short_description: NetApp ONTAP Job Schedule
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_license.py b/lib/ansible/modules/storage/netapp/na_ontap_license.py
index eba90c224da..6e6c41b39b9 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_license.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_license.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_license
 
-short_description: Manage NetApp ONTAP protocol and feature licenses
+short_description: NetApp ONTAP protocol and feature licenses
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_lun.py b/lib/ansible/modules/storage/netapp/na_ontap_lun.py
index 23533eb3279..e9455022bfa 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_lun.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_lun.py
@@ -16,36 +16,36 @@ DOCUMENTATION = '''
 
 module: na_ontap_lun
 
-short_description: Manage  NetApp ONTAP luns
+short_description: NetApp ONTAP manage LUNs
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 
 description:
-- Create, destroy, resize luns on NetApp ONTAP.
+- Create, destroy, resize LUNs on NetApp ONTAP.
 
 options:
 
   state:
     description:
-    - Whether the specified lun should exist or not.
+    - Whether the specified LUN should exist or not.
     choices: ['present', 'absent']
     default: present
 
   name:
     description:
-    - The name of the lun to manage.
+    - The name of the LUN to manage.
     required: true
 
   flexvol_name:
     description:
-    - The name of the FlexVol the lun should exist on.
+    - The name of the FlexVol the LUN should exist on.
     required: true
 
   size:
     description:
-    - The size of the lun in C(size_unit).
+    - The size of the LUN in C(size_unit).
     - Required when C(state=present).
 
   size_unit:
@@ -117,7 +117,7 @@ EXAMPLES = """
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
 
-- name: Resize Lun
+- name: Resize LUN
   na_ontap_lun:
     state: present
     name: ansibleLUN
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_lun_map.py b/lib/ansible/modules/storage/netapp/na_ontap_lun_map.py
index 5528531303b..443cabe9192 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_lun_map.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_lun_map.py
@@ -19,20 +19,20 @@ DOCUMENTATION = """
 
 module: na_ontap_lun_map
 
-short_description: Manage NetApp ONTAP lun maps
+short_description: NetApp ONTAP LUN maps
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 
 description:
-- Map and unmap luns on NetApp ONTAP.
+- Map and unmap LUNs on NetApp ONTAP.
 
 options:
 
   state:
     description:
-    - Whether the specified lun should exist or not.
+    - Whether the specified LUN should exist or not.
     choices: ['present', 'absent']
     default: present
 
@@ -59,7 +59,7 @@ options:
 """
 
 EXAMPLES = """
-- name: Create lun mapping
+- name: Create LUN mapping
   na_ontap_lun_map:
     state: present
     initiator_group_name: ansibleIgroup3234
@@ -69,7 +69,7 @@ EXAMPLES = """
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
 
-- name: Unmap Lun
+- name: Unmap LUN
   na_ontap_lun_map:
     state: absent
     initiator_group_name: ansibleIgroup3234
@@ -102,7 +102,7 @@ lun_naa_id:
     type: string
     sample: 600a0980383045372f5d4c5a70315474
 lun_state:
-    description: Online or offline tatus of the LUN.
+    description: Online or offline status of the LUN.
     returned: success
     type: string
     sample: online
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_net_ifgrp.py b/lib/ansible/modules/storage/netapp/na_ontap_net_ifgrp.py
index 88d981a8e7f..b19f44ce0ac 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_net_ifgrp.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_net_ifgrp.py
@@ -13,7 +13,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = """
 module: na_ontap_net_ifgrp
-short_description: Create, modify, destroy the network interface group
+short_description: NetApp Ontap modify network interface group
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_net_port.py b/lib/ansible/modules/storage/netapp/na_ontap_net_port.py
index 2d7b441af14..82c5e57cd34 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_net_port.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_net_port.py
@@ -13,13 +13,13 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = """
 module: na_ontap_net_port
-short_description: Manage NetApp ONTAP network ports.
+short_description: NetApp ONTAP network ports.
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
-- Modify a Ontap network port.
+- Modify a ONTAP network port.
 options:
   state:
     description:
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_net_routes.py b/lib/ansible/modules/storage/netapp/na_ontap_net_routes.py
index 554a823f980..53ffc15cc92 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_net_routes.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_net_routes.py
@@ -13,7 +13,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_net_routes
-short_description: Manage NetApp ONTAP network routes
+short_description: NetApp ONTAP network routes
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_net_vlan.py b/lib/ansible/modules/storage/netapp/na_ontap_net_vlan.py
index 5a2b0383166..ed7c807ac7d 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_net_vlan.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_net_vlan.py
@@ -12,37 +12,37 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_net_vlan
-short_description: Manage NetApp ONTAP network vlan
+short_description: NetApp ONTAP network VLAN
 extends_documentation_fragment:
     - netapp.ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
-- Create or Delete a network vlan
+- Create or Delete a network VLAN
 options:
   state:
     description:
-    - Whether the specified network vlan should exist or not
+    - Whether the specified network VLAN should exist or not
     choices: ['present', 'absent']
     default: present
   parent_interface:
     description:
-    - The interface that hosts the vlan interface.
+    - The interface that hosts the VLAN interface.
     required: true
   vlanid:
     description:
-    - The vlan id. Ranges from 1 to 4094.
+    - The VLAN id. Ranges from 1 to 4094.
     required: true
   node:
     description:
-    - Node name of vlan interface.
+    - Node name of VLAN interface.
     required: true
 notes:
   - The C(interface_name) option has been removed and should be deleted from playbooks
 '''
 
 EXAMPLES = """
-    - name: create vlan
+    - name: create VLAN
       na_ontap_net_vlan:
         state=present
         vlanid=13
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_nfs.py b/lib/ansible/modules/storage/netapp/na_ontap_nfs.py
index 1d93c4a1dee..8fffef30c67 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_nfs.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_nfs.py
@@ -14,22 +14,22 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = """
 module: na_ontap_nfs
-short_description: Manage ONTAP NFS status
+short_description: NetApp ONTAP NFS status
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
-- Enable or disable nfs on ONTAP
+- Enable or disable NFS on ONTAP
 options:
   state:
     description:
-    - Whether nfs should exist or not.
+    - Whether NFS should exist or not.
     choices: ['present', 'absent']
     default: present
   service_state:
     description:
-    - Whether the specified nfs should be enabled or disabled. Creates nfs service if doesnt exist.
+    - Whether the specified NFS should be enabled or disabled. Creates NFS service if doesnt exist.
     choices: ['started', 'stopped']
   vserver:
     description:
@@ -37,7 +37,7 @@ options:
     required: true
   nfsv3:
     description:
-    - status of nfsv3.
+    - status of NFSv3.
     choices: ['enabled', 'disabled']
   nfsv3_fsid_change:
     description:
@@ -46,11 +46,11 @@ options:
     version_added: '2.7'
   nfsv4:
     description:
-    - status of nfsv4.
+    - status of NFSv4.
     choices: ['enabled', 'disabled']
   nfsv41:
     description:
-    - status of nfsv41.
+    - status of NFSv41.
     aliases: ['nfsv4.1']
     choices: ['enabled', 'disabled']
   vstorage_state:
@@ -100,7 +100,7 @@ options:
     choices: ['enabled', 'disabled']
   showmount:
     description:
-    - status for if SVM allows showmount
+    - Whether SVM allows showmount
     choices: ['enabled', 'disabled']
     version_added: '2.7'
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_ntp.py b/lib/ansible/modules/storage/netapp/na_ontap_ntp.py
index a8dba820fee..bc55b57ec98 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_ntp.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_ntp.py
@@ -14,26 +14,26 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = """
 module: na_ontap_ntp
-short_description: Create/Delete/modify_version ONTAP NTP server
+short_description: NetApp ONTAP NTP server
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
-- Create or delete or modify ntp server in ONTAP
+- Create or delete or modify NTP server in ONTAP
 options:
   state:
     description:
-    - Whether the specified ntp server should exist or not.
+    - Whether the specified NTP server should exist or not.
     choices: ['present', 'absent']
     default: 'present'
   server_name:
     description:
-    - The name of the ntp server to manage.
+    - The name of the NTP server to manage.
     required: True
   version:
     description:
-    - give version for ntp server
+    - give version for NTP server
     choices: ['auto', '3', '4']
     default: 'auto'
 """
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_qtree.py b/lib/ansible/modules/storage/netapp/na_ontap_qtree.py
index 3e39d29488a..8f0ee72a3c2 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_qtree.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_qtree.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_qtree
 
-short_description: Manage qtrees
+short_description: NetApp ONTAP manage qtrees
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
@@ -29,23 +29,23 @@ options:
 
   state:
     description:
-    - Whether the specified Qtree should exist or not.
+    - Whether the specified qtree should exist or not.
     choices: ['present', 'absent']
     default: 'present'
 
   name:
     description:
-    - The name of the Qtree to manage.
+    - The name of the qtree to manage.
     required: true
 
   from_name:
     description:
-    - Name of the Qtree to be renamed.
+    - Name of the qtree to be renamed.
     version_added: '2.7'
 
   flexvol_name:
     description:
-    - The name of the FlexVol the Qtree should exist on. Required when C(state=present).
+    - The name of the FlexVol the qtree should exist on. Required when C(state=present).
 
   vserver:
     description:
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_service_processor_network.py b/lib/ansible/modules/storage/netapp/na_ontap_service_processor_network.py
index ae18bb2e4d5..955c2ea85be 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_service_processor_network.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_service_processor_network.py
@@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_service_processor_network
-short_description: Manage NetApp ONTAP service processor network
+short_description: NetApp ONTAP service processor network
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_snapshot.py b/lib/ansible/modules/storage/netapp/na_ontap_snapshot.py
index 1afc0254e02..f54a8a194e0 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_snapshot.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_snapshot.py
@@ -14,7 +14,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_snapshot
-short_description: Manage NetApp Snapshots
+short_description: NetApp ONTAP manage Snapshots
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_snmp.py b/lib/ansible/modules/storage/netapp/na_ontap_snmp.py
index 9b94b553aa3..b583523ef68 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_snmp.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_snmp.py
@@ -35,7 +35,7 @@ options:
     description:
       - "Whether the specified SNMP community should exist or not."
     default: 'present'
-short_description: "Manage NetApp SNMP community"
+short_description: NetApp ONTAP SNMP community
 version_added: "2.6"
 '''
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_software_update.py b/lib/ansible/modules/storage/netapp/na_ontap_software_update.py
index 1c23a6d3fbc..021dc911bed 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_software_update.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_software_update.py
@@ -39,7 +39,7 @@ options:
       - Allows the update to continue if warnings are encountered during the validation phase.
     default: False
     type: bool
-short_description: "NetApp ONTAP Update software"
+short_description: NetApp ONTAP Update Software
 version_added: "2.7"
 '''
 
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_svm_options.py b/lib/ansible/modules/storage/netapp/na_ontap_svm_options.py
index ea1a9ff6f80..bef3a49bdd2 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_svm_options.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_svm_options.py
@@ -11,11 +11,11 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'supported_by': 'community'}
 
 DOCUMENTATION = '''
-short_description: NetApp ONTAP Modify Options
+short_description: NetApp ONTAP Modify SVM Options
 author: NetApp Ansible Team (ng-ansibleteam@netapp.com)
 description:
-  - Modify ONTAP Options
-  - Only Options that appear on "vserver options show" are setable
+  - Modify ONTAP SVM Options
+  - Only Options that appear on "vserver options show" can be set
 extends_documentation_fragment:
   - netapp.na_ontap
 module: na_ontap_svm_options
@@ -23,10 +23,10 @@ version_added: "2.7"
 options:
   name:
     description:
-      - Name of the option. This field is optional in Data ONTAP Cluster-Mode, but required in Data ONTAP 7-Mode.
+      - Name of the option.
   value:
     description:
-      - Value of the option. This field is optional in Data ONTAP Cluster-Mode, but required in Data ONTAP 7-Mode.
+      - Value of the option.
       - Value must be in quote
   vserver:
     description:
@@ -35,7 +35,7 @@ options:
 '''
 
 EXAMPLES = """
-    - name: Set Options
+    - name: Set SVM Options
       na_ontap_svm_options:
         vserver: "{{ netapp_vserver_name }}"
         hostname: "{{ netapp_hostname }}"
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_ucadapter.py b/lib/ansible/modules/storage/netapp/na_ontap_ucadapter.py
index 2a4adbfa0b3..9695ed75831 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_ucadapter.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_ucadapter.py
@@ -17,7 +17,7 @@ DOCUMENTATION = '''
 ---
 
 module: na_ontap_ucadapter
-short_description: ONTAP UC adapter configuration
+short_description: NetApp ONTAP UC adapter configuration
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_user.py b/lib/ansible/modules/storage/netapp/na_ontap_user.py
index 28cddeb7f3a..bb30cec2c9b 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_user.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_user.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_user
 
-short_description: useradmin configuration and management
+short_description: NetApp ONTAP user configuration and management
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_user_role.py b/lib/ansible/modules/storage/netapp/na_ontap_user_role.py
index 2178dfb5bf6..4dee1feeab7 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_user_role.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_user_role.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_user_role
 
-short_description: useradmin configuration and management
+short_description: NetApp ONTAP user role configuration and management
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_volume.py b/lib/ansible/modules/storage/netapp/na_ontap_volume.py
index e651d5683cf..230f72e843b 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_volume.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_volume.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 
 module: na_ontap_volume
 
-short_description: Manage NetApp ONTAP volumes.
+short_description: NetApp ONTAP manage volumes.
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_volume_clone.py b/lib/ansible/modules/storage/netapp/na_ontap_volume_clone.py
index df6ee2b6714..350c72a5eb4 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_volume_clone.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_volume_clone.py
@@ -12,7 +12,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 module: na_ontap_volume_clone
-short_description: Manage NetApp ONTAP volume clones.
+short_description: NetApp ONTAP manage volume clones.
 extends_documentation_fragment:
     - netapp.na_ontap
 version_added: '2.6'
diff --git a/lib/ansible/modules/storage/netapp/na_ontap_vserver_peer.py b/lib/ansible/modules/storage/netapp/na_ontap_vserver_peer.py
index bcf84ecbd2b..3ed051e3273 100644
--- a/lib/ansible/modules/storage/netapp/na_ontap_vserver_peer.py
+++ b/lib/ansible/modules/storage/netapp/na_ontap_vserver_peer.py
@@ -49,7 +49,7 @@ options:
     description:
      - Destination password.
      - Optional if this is same as source password.
-short_description: "Manage NetApp Vserver peering"
+short_description: NetApp ONTAP Vserver peering
 version_added: "2.7"
 '''