diff --git a/README.md b/README.md
index e4c72eff..a2bddca4 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,10 @@ The following modules do not have REST equivalent APIs. They will stop working o
   - na_ontap_svm - updated documentation for `allowed_protocols` & `services`.
   - na_ontap_volume - new option `large_size_enabled` added in REST, requires ONTAP 9.12 or later.
   - na_ontap_dns - updated documentation for `vserver`.
+  - multiple modules - standardized hostname, username, and password parameters to use `netapp_hostname`, `netapp_username`, and `netapp_password` as values.
+  - multiple modules - updated examples to use Fully Qualified Collection Name.
+  - na_ontap_rest_cli - added POST and DELETE examples.
+  - updated dead link in doc_fragments.
 
 ### Bug Fixes
   - Resolved Ansible lint issues.
diff --git a/changelogs/fragments/github-220.yaml b/changelogs/fragments/github-220.yaml
new file mode 100644
index 00000000..a22259d1
--- /dev/null
+++ b/changelogs/fragments/github-220.yaml
@@ -0,0 +1,5 @@
+minor_changes:
+  - Multiple modules - Standardize hostname, username, and password parameters to use netapp_hostname, netapp_username, and netapp_password as values.
+  - Multiple modules - Update examples to use Fully Qualified Collection Name.
+  - na_ontap_rest_cli - Add POST and DELETE examples.
+  - Update dead link in doc_fragments.
diff --git a/plugins/doc_fragments/netapp.py b/plugins/doc_fragments/netapp.py
index 1a29d2b2..f84d1045 100644
--- a/plugins/doc_fragments/netapp.py
+++ b/plugins/doc_fragments/netapp.py
@@ -28,9 +28,9 @@ class ModuleDocFragment(object):
   username:
       description:
         - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
-        - For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+        - For more information, please read the documentation U(https://docs.netapp.com/us-en/ontap/authentication/create-svm-user-accounts-task.html).
         - Two authentication methods are supported
-        - 1. basic authentication, using username and password,
+        - 1. Basic authentication, using username and password.
         - 2. SSL certificate authentication, using a ssl client cert file, and optionally a private key file.
         - To use a certificate, the certificate must have been installed in the ONTAP cluster, and cert authentication must have been enabled.
       type: str
@@ -125,9 +125,9 @@ class ModuleDocFragment(object):
   username:
       description:
         - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
-        - For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+        - For more information, please read the documentation U(https://docs.netapp.com/us-en/ontap/authentication/create-svm-user-accounts-task.html).
         - Two authentication methods are supported
-        - 1. basic authentication, using username and password,
+        - 1. Basic authentication, using username and password.
         - 2. SSL certificate authentication, using a ssl client cert file, and optionally a private key file.
         - To use a certificate, the certificate must have been installed in the ONTAP cluster, and cert authentication must have been enabled.
       type: str
@@ -208,9 +208,9 @@ class ModuleDocFragment(object):
   username:
       description:
         - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
-        - For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+        - For more information, please read the documentation U(https://docs.netapp.com/us-en/ontap/authentication/create-svm-user-accounts-task.html).
         - Two authentication methods are supported
-        - 1. basic authentication, using username and password,
+        - 1. Basic authentication, using username and password.
         - 2. SSL certificate authentication, using a ssl client cert file, and optionally a private key file.
         - To use a certificate, the certificate must have been installed in the ONTAP cluster, and cert authentication must have been enabled.
       type: str
diff --git a/plugins/modules/na_ontap_active_directory_domain_controllers.py b/plugins/modules/na_ontap_active_directory_domain_controllers.py
index cefb0943..8470ede4 100644
--- a/plugins/modules/na_ontap_active_directory_domain_controllers.py
+++ b/plugins/modules/na_ontap_active_directory_domain_controllers.py
@@ -55,9 +55,9 @@
 EXAMPLES = """
 - name: Create active directory preferred domain controllers
   netapp.ontap.na_ontap_active_directory_domain_controllers:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     https: true
     validate_certs: false
     vserver: ansible
@@ -67,9 +67,9 @@
 
 - name: Delete active directory preferred domain controllers
   netapp.ontap.na_ontap_active_directory_domain_controllers:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     https: true
     validate_certs: false
     vserver: ansible
diff --git a/plugins/modules/na_ontap_autosupport.py b/plugins/modules/na_ontap_autosupport.py
index f8c1f435..b6e2d526 100644
--- a/plugins/modules/na_ontap_autosupport.py
+++ b/plugins/modules/na_ontap_autosupport.py
@@ -137,9 +137,9 @@
 EXAMPLES = """
 - name: Enable autosupport
   netapp.ontap.na_ontap_autosupport:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: present
     node_name: test
     transport: https
@@ -150,9 +150,9 @@
 
 - name: Modify autosupport proxy_url with password
   netapp.ontap.na_ontap_autosupport:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: present
     node_name: test
     transport: https
@@ -160,9 +160,9 @@
 
 - name: Modify autosupport proxy_url without password
   netapp.ontap.na_ontap_autosupport:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: present
     node_name: test
     transport: https
@@ -170,9 +170,9 @@
 
 - name: Disable autosupport
   netapp.ontap.na_ontap_autosupport:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: absent
     node_name: test
 """
diff --git a/plugins/modules/na_ontap_autosupport_invoke.py b/plugins/modules/na_ontap_autosupport_invoke.py
index 3e1b1b75..ac49b4ea 100644
--- a/plugins/modules/na_ontap_autosupport_invoke.py
+++ b/plugins/modules/na_ontap_autosupport_invoke.py
@@ -66,9 +66,9 @@
     autosupport_message: invoked test autosupport rest
     uri: http://1.2.3.4/delivery_uri
     type: test
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_broadcast_domain_ports.py b/plugins/modules/na_ontap_broadcast_domain_ports.py
index 8baab4dd..8659e820 100644
--- a/plugins/modules/na_ontap_broadcast_domain_ports.py
+++ b/plugins/modules/na_ontap_broadcast_domain_ports.py
@@ -45,23 +45,23 @@
 '''
 
 EXAMPLES = """
-- name: Create broadcast domain ports
-  na_ontap_broadcast_domain_ports:
-    state=present
-    username={{ netapp_username }}
-    password={{ netapp_password }}
-    hostname={{ netapp_hostname }}
-    broadcast_domain=123kevin
-    ports=khutton-vsim1:e0d-13
-
-- name: Delete broadcast domain ports
-  na_ontap_broadcast_domain_ports:
-    state=absent
-    username={{ netapp_username }}
-    password={{ netapp_password }}
-    hostname={{ netapp_hostname }}
-    broadcast_domain=123kevin
-    ports=khutton-vsim1:e0d-13
+- name: Create broadcast-domain ports
+  netapp.ontap.na_ontap_broadcast_domain_ports:
+    state: present
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    broadcast_domain: 123kevin
+    ports: khutton-vsim1:e0d-13
+
+- name: Delete broadcast-domain ports
+  netapp.ontap.na_ontap_broadcast_domain_ports:
+    state: absent
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    broadcast_domain: 123kevin
+    ports: khutton-vsim1:e0d-13
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_cg_snapshot.py b/plugins/modules/na_ontap_cg_snapshot.py
index 1e7dea2e..9e593d91 100644
--- a/plugins/modules/na_ontap_cg_snapshot.py
+++ b/plugins/modules/na_ontap_cg_snapshot.py
@@ -82,9 +82,9 @@
     vserver: vserver_name
     snapshot: snapshot name
     volumes: vol_name
-    username: "{{ netapp username }}"
-    password: "{{ netapp password }}"
-    hostname: "{{ netapp hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Create CG snapshot using CG name - REST
   na_ontap_cg_snapshot:
@@ -93,9 +93,9 @@
     snapshot: snapshot_name
     consistency_group: cg_name
     snapmirror_label: sm_label
-    username: "{{ netapp username }}"
-    password: "{{ netapp password }}"
-    hostname: "{{ netapp hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Create CG snapshot using volumes - REST
   na_ontap_cg_snapshot:
@@ -103,12 +103,12 @@
     vserver: vserver_name
     snapshot: snapshot_name
     volumes:
-        - vol1
-        - vol2
+      - vol1
+      - vol2
     snapmirror_label: sm_label
-    username: "{{ netapp username }}"
-    password: "{{ netapp password }}"
-    hostname: "{{ netapp hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete CG snapshot - REST
   na_ontap_cg_snapshot:
@@ -116,9 +116,9 @@
     vserver: vserver_name
     snapshot: snapshot_name
     consistency_group: cg_name
-    username: "{{ netapp username }}"
-    password: "{{ netapp password }}"
-    hostname: "{{ netapp hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_cifs_local_group.py b/plugins/modules/na_ontap_cifs_local_group.py
index 6ed8dd16..d78e6561 100644
--- a/plugins/modules/na_ontap_cifs_local_group.py
+++ b/plugins/modules/na_ontap_cifs_local_group.py
@@ -53,9 +53,9 @@
     state: present
     vserver: svm1
     name: BUILTIN\\administrators
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 
@@ -64,9 +64,9 @@
     state: absent
     vserver: svm1
     name: BUILTIN\\administrators
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 
@@ -76,9 +76,9 @@
     vserver: svm1
     name: BUILTIN\\administrators
     descrition: 'CIFS local group'
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 
@@ -88,9 +88,9 @@
     vserver: svm1
     name: ANSIBLE_CIFS\\test_users
     descrition: 'CIFS local group'
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 """
diff --git a/plugins/modules/na_ontap_cifs_local_group_member.py b/plugins/modules/na_ontap_cifs_local_group_member.py
index ee7dcf3b..b8f68af8 100644
--- a/plugins/modules/na_ontap_cifs_local_group_member.py
+++ b/plugins/modules/na_ontap_cifs_local_group_member.py
@@ -55,9 +55,9 @@
     vserver: svm1
     group: BUILTIN\\administrators
     member: DOMAIN\\Domain Admins
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     ontapi: "{{ ontap_facts.ontap_version }}"
     https: true
     validate_certs: false
@@ -68,9 +68,9 @@
     vserver: svm1
     group: BUILTIN\\administrators
     member: DOMAIN\\Domain Admins
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     ontapi: "{{ ontap_facts.ontap_version }}"
     https: true
     validate_certs: false
diff --git a/plugins/modules/na_ontap_cifs_local_user_modify.py b/plugins/modules/na_ontap_cifs_local_user_modify.py
index 0ece72a1..81dd402c 100644
--- a/plugins/modules/na_ontap_cifs_local_user_modify.py
+++ b/plugins/modules/na_ontap_cifs_local_user_modify.py
@@ -56,18 +56,18 @@
     name: BUILTIN\\administrators
     vserver: ansible
     is_account_disabled: false
-    username: '{{ username }}'
-    password: '{{ password }}'
-    hostname: '{{ hostname }}'
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Disable local CIFS Administrator account
   na_ontap_cifs_local_user_modify:
     name: BUILTIN\\administrators
     vserver: ansible
     is_account_disabled: true
-    username: '{{ username }}'
-    password: '{{ password }}'
-    hostname: '{{ hostname }}'
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_cifs_local_user_set_password.py b/plugins/modules/na_ontap_cifs_local_user_set_password.py
index 86670746..c7adfd35 100644
--- a/plugins/modules/na_ontap_cifs_local_user_set_password.py
+++ b/plugins/modules/na_ontap_cifs_local_user_set_password.py
@@ -51,9 +51,9 @@
     user_name: Administrator
     user_password: Test123!
     vserver: ansible
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_command.py b/plugins/modules/na_ontap_command.py
index 99ccbe85..6a22e81a 100644
--- a/plugins/modules/na_ontap_command.py
+++ b/plugins/modules/na_ontap_command.py
@@ -71,17 +71,17 @@
 EXAMPLES = """
 - name: Run ONTAP CLI command
   netapp.ontap.na_ontap_command:
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     command: ['version']
 
 # Same as above, but returns parseable dictonary
 - name: Run ONTAP CLI command
   netapp.ontap.na_ontap_command:
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     command: ['node', 'show', '-fields', 'node,health,uptime,model']
     privilege: 'admin'
     return_dict: true
@@ -89,9 +89,9 @@
 # Same as above, but with lines filtering
 - name: Run ONTAP CLI command
   netapp.ontap.na_ontap_command:
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     command: ['node', 'show', '-fields', 'node,health,uptime,model']
     exclude_lines: 'ode ' # Exclude lines with 'Node ' or 'node ', or anything else containing 'ode '.
     privilege: 'admin'
diff --git a/plugins/modules/na_ontap_disk_options.py b/plugins/modules/na_ontap_disk_options.py
index af36ee17..ac8483cd 100644
--- a/plugins/modules/na_ontap_disk_options.py
+++ b/plugins/modules/na_ontap_disk_options.py
@@ -52,17 +52,17 @@
   netapp.ontap.na_ontap_disk_options:
     node: node1
     autoassign: true
-    username: '{{ username }}'
-    password: '{{ password }}'
-    hostname: '{{ hostname }}'
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Disable Disk Auto Assign
   netapp.ontap.na_ontap_disk_options:
     node: node1
     autoassign: false
-    username: '{{ username }}'
-    password: '{{ password }}'
-    hostname: '{{ hostname }}'
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_disks.py b/plugins/modules/na_ontap_disks.py
index 93bbd293..15e2b2c5 100644
--- a/plugins/modules/na_ontap_disks.py
+++ b/plugins/modules/na_ontap_disks.py
@@ -58,16 +58,16 @@
     disk_count: 56
     disk_type: VMDISK
     min_spares: 2
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Assign all unassigned disks to node1
   netapp.ontap.na_ontap_disks:
     node: node1
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_dns.py b/plugins/modules/na_ontap_dns.py
index 82a78593..e8ada88d 100644
--- a/plugins/modules/na_ontap_dns.py
+++ b/plugins/modules/na_ontap_dns.py
@@ -62,10 +62,10 @@
 - name: Create or modify DNS
   netapp.ontap.na_ontap_dns:
     state: present
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
-    vserver: "{{vservername}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
+    vserver: "{{ vservername }}"
     domains: sales.bar.com
     nameservers: 10.193.0.250,10.192.0.250
     skip_validation: true
@@ -73,9 +73,9 @@
 - name: Create or modify cluster DNS with REST
   netapp.ontap.na_ontap_dns:
     state: present
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     domains: sales.bar.com
     nameservers: 10.193.0.250,10.192.0.250
 """
diff --git a/plugins/modules/na_ontap_domain_tunnel.py b/plugins/modules/na_ontap_domain_tunnel.py
index e212e86d..e29e5ee8 100644
--- a/plugins/modules/na_ontap_domain_tunnel.py
+++ b/plugins/modules/na_ontap_domain_tunnel.py
@@ -40,9 +40,9 @@
   netapp.ontap.na_ontap_domain_tunnel:
     state: present
     vserver: svm1
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_efficiency_policy.py b/plugins/modules/na_ontap_efficiency_policy.py
index 6e72e013..6f9e4646 100644
--- a/plugins/modules/na_ontap_efficiency_policy.py
+++ b/plugins/modules/na_ontap_efficiency_policy.py
@@ -91,9 +91,9 @@
 EXAMPLES = """
 - name: Create threshold efficiency policy
   netapp.ontap.na_ontap_efficiency_policy:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     vserver: ansible
     state: present
     policy_name: test
@@ -105,9 +105,9 @@
 
 - name: Create Scheduled efficiency Policy
   netapp.ontap.na_ontap_efficiency_policy:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     vserver: ansible
     state: present
     policy_name: test2
diff --git a/plugins/modules/na_ontap_ems_destination.py b/plugins/modules/na_ontap_ems_destination.py
index 7dfd265b..797fdd01 100644
--- a/plugins/modules/na_ontap_ems_destination.py
+++ b/plugins/modules/na_ontap_ems_destination.py
@@ -109,9 +109,9 @@
     type: rest_api
     filters: ['important_events']
     destination: http://my.rest.api/address
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Configure REST EMS destination with a certificate
   netapp.ontap.na_ontap_ems_destination:
@@ -122,9 +122,9 @@
     destination: http://my.rest.api/address
     certificate: my_cert
     ca: my_cert_ca
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Configure REST EMS destination with type syslog
   netapp.ontap.na_ontap_ems_destination:
@@ -141,9 +141,9 @@
       message_format: legacy_netapp
       hostname_format_override: no_override
       timestamp_format_override: no_override
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Remove email EMS destination
   netapp.ontap.na_ontap_ems_destination:
@@ -152,9 +152,9 @@
     type: email
     filters: ['important_events']
     destination: netapp@company.com
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_fcp.py b/plugins/modules/na_ontap_fcp.py
index 8faa0274..22c7ea2b 100644
--- a/plugins/modules/na_ontap_fcp.py
+++ b/plugins/modules/na_ontap_fcp.py
@@ -43,10 +43,10 @@
   netapp.ontap.na_ontap_fcp:
     state: present
     status: down
-    hostname: "{{hostname}}"
-    username: "{{username}}"
-    password: "{{password}}"
-    vserver: "{{vservername}}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
+    vserver: "{{ vserver_name }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_fdsd.py b/plugins/modules/na_ontap_fdsd.py
index 162cc5f3..534759c5 100644
--- a/plugins/modules/na_ontap_fdsd.py
+++ b/plugins/modules/na_ontap_fdsd.py
@@ -43,18 +43,18 @@
     state: present
     name: "ansible_sdl"
     vserver: "svm1"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete File Directory Security Descriptor
   netapp.ontap.na_ontap_fdsd:
     state: absent
     vserver: "svm1"
     name: "ansible_sdl"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_fdsp.py b/plugins/modules/na_ontap_fdsp.py
index 3146dfd7..05918718 100644
--- a/plugins/modules/na_ontap_fdsp.py
+++ b/plugins/modules/na_ontap_fdsp.py
@@ -43,18 +43,18 @@
     state: present
     name: "ansible_security_policyl"
     vserver: "svm1"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete File Directory Security Policy
   netapp.ontap.na_ontap_fdsp:
     state: absent
     vserver: "svm1"
     name: "ansible_security_policyl"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_fdspt.py b/plugins/modules/na_ontap_fdspt.py
index 38f13c24..97d90d19 100644
--- a/plugins/modules/na_ontap_fdspt.py
+++ b/plugins/modules/na_ontap_fdspt.py
@@ -87,9 +87,9 @@
     ntfs_mode: "replace"
     security_type: "ntfs"
     path: "/volume1"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Modify File Directory Security Policy Task
   netapp.ontap.na_ontap_na_ontap_fdspt:
@@ -100,9 +100,9 @@
     ntfs_sd: "ansible1_sd"
     ntfs_mode: "replace"
     security_type: "ntfs"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Remove File Directory Security Policy Task
   netapp.ontap.na_ontap_na_ontap_fdspt:
@@ -111,9 +111,9 @@
     name: "ansible_pl"
     access_control: "file_directory"
     path: "/volume1"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_file_directory_policy.py b/plugins/modules/na_ontap_file_directory_policy.py
index 184c0f43..1932b66c 100644
--- a/plugins/modules/na_ontap_file_directory_policy.py
+++ b/plugins/modules/na_ontap_file_directory_policy.py
@@ -89,9 +89,9 @@
 EXAMPLES = """
 - name: Create policy
   netapp.ontap.na_ontap_file_directory_policy:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: present
     vserver: ansible
     policy_name: file_policy
@@ -99,9 +99,9 @@
 
 - name: Add task to existing file_policy
   netapp.ontap.na_ontap_file_directory_policy:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: present
     vserver: ansible
     policy_name: file_policy
@@ -111,9 +111,9 @@
 
 - name: Delete task from file_policy.
   netapp.ontap.na_ontap_file_directory_policy:
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     state: absent
     vserver: ansible
     policy_name: file_policy
@@ -130,7 +130,6 @@
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_file_security_permissions.py b/plugins/modules/na_ontap_file_security_permissions.py
index 16c06822..512c6b15 100644
--- a/plugins/modules/na_ontap_file_security_permissions.py
+++ b/plugins/modules/na_ontap_file_security_permissions.py
@@ -268,11 +268,9 @@
         user: "{{ user }}"
         apply_to:
           files: true
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-    https: "{{ https }}"
-    validate_certs: "{{ validate_certs }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify file directory security permissions.
   netapp.ontap.na_ontap_file_security_permissions:
@@ -289,11 +287,9 @@
         user: "{{ user }}"
         apply_to:
           files: true
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-    https: "{{ https }}"
-    validate_certs: "{{ validate_certs }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Delete file directory security ACLs.
   netapp.ontap.na_ontap_file_security_permissions:
@@ -310,11 +306,9 @@
         user: "{{ user }}"
         apply_to:
           files: true
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-    https: "{{ https }}"
-    validate_certs: "{{ validate_certs }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_firmware_upgrade.py b/plugins/modules/na_ontap_firmware_upgrade.py
index cbe777f0..afc78789 100644
--- a/plugins/modules/na_ontap_firmware_upgrade.py
+++ b/plugins/modules/na_ontap_firmware_upgrade.py
@@ -162,13 +162,14 @@
 '''
 
 EXAMPLES = """
-- name: Firmware upgrade
+- name: Any firmware upgrade - REST
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
     package_url: "{{ web_link }}"
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
+
 - name: Firmware upgrade, confirm successful download
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -177,6 +178,7 @@
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
     fail_on_502_error: true
+
 - name: SP firmware upgrade
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -191,6 +193,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
+
 - name: SP firmware download replace package
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -204,6 +207,7 @@
     password: "{{ netapp_password }}"
     https: true
     validate_certs: false
+
 - name: SP firmware download rename package
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -216,6 +220,7 @@
     password: "{{ netapp_password }}"
     https: true
     validate_certs: false
+
 - name: ACP firmware download and upgrade
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -225,6 +230,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
+
 - name: Shelf firmware upgrade
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -233,6 +239,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
+
 - name: Disk firmware upgrade
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
@@ -241,13 +248,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-- name: Any firmware upgrade (REST)
-  netapp.ontap.na_ontap_firmware_upgrade:
-    state: present
-    package_url: "{{ web_link }}"
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
+
 - name: SP firmware upgrade with reboots (REST)
   netapp.ontap.na_ontap_firmware_upgrade:
     state: present
diff --git a/plugins/modules/na_ontap_fpolicy_event.py b/plugins/modules/na_ontap_fpolicy_event.py
index 9d9fa989..967033f9 100644
--- a/plugins/modules/na_ontap_fpolicy_event.py
+++ b/plugins/modules/na_ontap_fpolicy_event.py
@@ -78,9 +78,9 @@
     filters: ['first_read', 'close_with_modification']
     protocol: cifs
     volume_monitoring: false
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Modify FPolicy Event
   netapp.ontap.na_ontap_fpolicy_event:
@@ -88,21 +88,22 @@
     vserver: svm1
     name: fpolicy_event
     volume_monitoring: true
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete FPolicy Event
   netapp.ontap.na_ontap_fpolicy_event:
     state: absent
     vserver: svm1
     name: fpolicy_event
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
-RETURN = """ # """
+RETURN = """
+"""
 
 import traceback
 
diff --git a/plugins/modules/na_ontap_fpolicy_ext_engine.py b/plugins/modules/na_ontap_fpolicy_ext_engine.py
index 5191ace7..ce516238 100644
--- a/plugins/modules/na_ontap_fpolicy_ext_engine.py
+++ b/plugins/modules/na_ontap_fpolicy_ext_engine.py
@@ -126,9 +126,9 @@
     extern_engine_type: asynchronous
     primary_servers: ['10.11.12.13', '10.11.12.14']
     ssl_option: no_auth
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Modify fPolicy external engine
   netapp.ontap.na_ontap_fpolicy_ext_engine:
@@ -139,22 +139,21 @@
     extern_engine_type: synchronous
     primary_servers: ['10.11.12.15', '10.11.12.16']
     ssl_option: server_auth
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete fPolicy external engine
   netapp.ontap.na_ontap_fpolicy_ext_engine:
     state: absent
     vserver: svm1
     name: fpolicy_engine
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_fpolicy_policy.py b/plugins/modules/na_ontap_fpolicy_policy.py
index 96e14b8b..1c060b4b 100644
--- a/plugins/modules/na_ontap_fpolicy_policy.py
+++ b/plugins/modules/na_ontap_fpolicy_policy.py
@@ -83,9 +83,9 @@
     name: fpolicy_policy
     events: fcpolicy_event
     engine: fpolicy_ext_engine
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Modify FPolicy policy
   netapp.ontap.na_ontap_fpolicy_policy:
@@ -94,9 +94,9 @@
     name: fpolicy_policy
     events: fcpolicy_event
     is_mandatory: false
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete FPolicy policy
   netapp.ontap.na_ontap_fpolicy_policy:
@@ -104,13 +104,12 @@
     vserver: svm1
     name: fpolicy_policy
     events: fcpolicy_event
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_fpolicy_scope.py b/plugins/modules/na_ontap_fpolicy_scope.py
index 02694a49..fb04fcf0 100644
--- a/plugins/modules/na_ontap_fpolicy_scope.py
+++ b/plugins/modules/na_ontap_fpolicy_scope.py
@@ -107,10 +107,9 @@
     name: policy1
     export_policies_to_include: export1
     shares_to_include: share1
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
-    use_rest: "{{ use_rest }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Modify FPolicy scope
   netapp.ontap.na_ontap_fpolicy_scope:
@@ -119,24 +118,21 @@
     name: policy1
     export_policies_to_include: export1,export2
     shares_to_include: share1,share2
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
-    use_rest: "{{ use_rest }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 
 - name: Delete FPolicy scope
   netapp.ontap.na_ontap_fpolicy_scope:
     state: absent
     vserver: GBSMNAS80LD
     name: policy1
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
-    use_rest: "{{ use_rest }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_fpolicy_status.py b/plugins/modules/na_ontap_fpolicy_status.py
index ee213efc..4cd879d8 100644
--- a/plugins/modules/na_ontap_fpolicy_status.py
+++ b/plugins/modules/na_ontap_fpolicy_status.py
@@ -41,7 +41,7 @@
     type: int
 
 notes:
-- Not support check_mode.
+- check_mode not supported.
 """
 
 EXAMPLES = """
@@ -51,9 +51,9 @@
     vserver: svm1
     policy_name: fpolicy_policy
     sequence_number: 10
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 
@@ -62,14 +62,15 @@
     state: absent
     vserver: svm1
     policy_name: fpolicy_policy
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    hostname: "{{ netapp_hostname }}"
     https: true
     validate_certs: false
 """
 
-RETURN = """ # """
+RETURN = """
+"""
 
 import traceback
 
diff --git a/plugins/modules/na_ontap_iscsi_security.py b/plugins/modules/na_ontap_iscsi_security.py
index 77335c6f..a4b4e637 100644
--- a/plugins/modules/na_ontap_iscsi_security.py
+++ b/plugins/modules/na_ontap_iscsi_security.py
@@ -70,11 +70,11 @@
 '''
 
 EXAMPLES = """
-- name: Create
+- name: Create iscsi security
   netapp.ontap.na_ontap_iscsi_security:
-    hostname: 0.0.0.0
-    username: user
-    password: pass
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     vserver: test_svm
     state: present
     initiator: eui.9999956789abcdef
@@ -87,9 +87,9 @@
 
 - name: Modify outbound username
   netapp.ontap.na_ontap_iscsi_security:
-    hostname: 0.0.0.0
-    username: user
-    password: pass
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     vserver: test_svm
     state: present
     initiator: eui.9999956789abcdef
@@ -102,9 +102,9 @@
 
 - name: Modify address
   netapp.ontap.na_ontap_iscsi_security:
-    hostname: 0.0.0.0
-    username: user
-    password: pass
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     vserver: test_svm
     state: present
     initiator: eui.9999956789abcdef
diff --git a/plugins/modules/na_ontap_kerberos_interface.py b/plugins/modules/na_ontap_kerberos_interface.py
index a087f6be..ac6cbb56 100644
--- a/plugins/modules/na_ontap_kerberos_interface.py
+++ b/plugins/modules/na_ontap_kerberos_interface.py
@@ -94,11 +94,9 @@
     service_principal_name: nfs/lif_svm1_284@RELAM2
     admin_username: "{{ admin_user }}"
     admin_password: "{{ admin_pass }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-    https: "{{ https }}"
-    validate_certs: "{{ certs }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 
 - name: Disable kerberos interface.
@@ -108,11 +106,9 @@
     enabled: false
     admin_username: "{{ admin_user }}"
     admin_password: "{{ admin_pass }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-    https: "{{ https }}"
-    validate_certs: "{{ certs }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_log_forward.py b/plugins/modules/na_ontap_log_forward.py
index 2ad66eb0..f2fcf488 100644
--- a/plugins/modules/na_ontap_log_forward.py
+++ b/plugins/modules/na_ontap_log_forward.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2021, NetApp, Inc
+# (c) 2021-2024, NetApp, Inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
@@ -64,38 +64,37 @@
 '''
 
 EXAMPLES = """
-- name: Create log forward configuration
-  na_ontap_log_forward:
-    state: present
-    destination: 10.11.12.13
-    port: 514
-    protocol: udp_unencrypted
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
-
-- name: Modify log forward configuration
-  na_ontap_log_forward:
-    state: present
-    destination: 10.11.12.13
-    port: 514
-    protocol: tcp_unencrypted
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
-
-- name: Delete log forward configuration
-  na_ontap_log_forward:
-    state: absent
-    destination: 10.11.12.13
-    port: 514
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    - name: Create log forward configuration
+      netapp.ontap.na_ontap_log_forward:
+        state: present
+        destination: 10.11.12.13
+        port: 514
+        protocol: udp_unencrypted
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+        hostname: "{{ netapp_hostname }}"
+
+    - name: Modify log forward configuration
+      netapp.ontap.na_ontap_log_forward:
+        state: present
+        destination: 10.11.12.13
+        port: 514
+        protocol: tcp_unencrypted
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+        hostname: "{{ netapp_hostname }}"
+
+    - name: Delete log forward configuration
+      netapp.ontap.na_ontap_log_forward:
+        state: absent
+        destination: 10.11.12.13
+        port: 514
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+        hostname: "{{ netapp_hostname }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_login_messages.py b/plugins/modules/na_ontap_login_messages.py
index c78391ea..0c281fd5 100644
--- a/plugins/modules/na_ontap_login_messages.py
+++ b/plugins/modules/na_ontap_login_messages.py
@@ -48,34 +48,33 @@
 '''
 
 EXAMPLES = """
-- name: Modify banner vserver
+- name: Modify vserver banner
   netapp.ontap.na_ontap_login_messages:
     vserver: trident_svm
     banner: this is trident vserver
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
-- name: Modify motd vserver
+- name: Modify vserver motd
   netapp.ontap.na_ontap_login_messages:
     vserver: trident_svm
     motd_message: this is trident vserver
     show_cluster_motd: true
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify motd cluster - REST
   netapp.ontap.na_ontap_login_messages:
     motd_message: this is a cluster motd with REST
     show_cluster_motd: true
-    username: "{{ username }}"
-    password: "{{ password }}"
-    hostname: "{{ hostname }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_lun.py b/plugins/modules/na_ontap_lun.py
index 03ea4f59..722f3de3 100644
--- a/plugins/modules/na_ontap_lun.py
+++ b/plugins/modules/na_ontap_lun.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2017-2023, NetApp, Inc
+# (c) 2017-2024, NetApp, Inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
@@ -238,76 +238,73 @@
 '''
 
 EXAMPLES = """
-- name: Create LUN
-  netapp.ontap.na_ontap_lun:
-    state: present
-    name: ansibleLUN
-    flexvol_name: ansibleVolume
-    vserver: ansibleVServer
-    size: 5
-    size_unit: mb
-    os_type: linux
-    space_reserve: true
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-
-- name: Resize LUN
-  netapp.ontap.na_ontap_lun:
-    state: present
-    name: ansibleLUN
-    force_resize: true
-    flexvol_name: ansibleVolume
-    vserver: ansibleVServer
-    size: 5
-    size_unit: gb
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-
-- name: Create LUNs using SAN application
-  tags: create
-  netapp.ontap.na_ontap_lun:
-    state: present
-    name: ansibleLUN
-    size: 15
-    size_unit: mb
-    os_type: linux
-    space_reserve: false
-    san_application_template:
-      name: san-ansibleLUN
-      igroup_name: testme_igroup
-      lun_count: 3
-      protection_type:
-      local_policy: default
-      exclude_aggregates: aggr0
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-
-- name: Convert existing volume to SAN application
-  tags: create
-  netapp.ontap.na_ontap_lun:
-    state: present
-    name: someVolume
-    size: 22
-    size_unit: mb
-    os_type: linux
-    space_reserve: false
-    san_application_template:
-      name: san-ansibleLUN
-      igroup_name: testme_igroup
-      lun_count: 3
-      protection_type:
-      local_policy: default
-      scope: application
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
+    - name: Create LUN
+      netapp.ontap.na_ontap_lun:
+        state: present
+        name: ansibleLUN
+        flexvol_name: ansibleVolume
+        vserver: ansibleVServer
+        size: 5
+        size_unit: mb
+        os_type: linux
+        space_reserve: true
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Resize LUN
+      netapp.ontap.na_ontap_lun:
+        state: present
+        name: ansibleLUN
+        force_resize: true
+        flexvol_name: ansibleVolume
+        vserver: ansibleVServer
+        size: 5
+        size_unit: gb
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Create LUNs using SAN application
+      netapp.ontap.na_ontap_lun:
+        state: present
+        name: ansibleLUN
+        size: 15
+        size_unit: mb
+        os_type: linux
+        space_reserve: false
+        san_application_template:
+            name: san-ansibleLUN
+            igroup_name: testme_igroup
+            lun_count: 3
+            protection_type:
+            local_policy: default
+            exclude_aggregates: aggr0
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Convert existing volume to SAN application
+      netapp.ontap.na_ontap_lun:
+        state: present
+        name: someVolume
+        size: 22
+        size_unit: mb
+        os_type: linux
+        space_reserve: false
+        san_application_template:
+            name: san-ansibleLUN
+            igroup_name: testme_igroup
+            lun_count: 3
+            protection_type:
+            local_policy: default
+            scope: application
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 
 import copy
diff --git a/plugins/modules/na_ontap_lun_map.py b/plugins/modules/na_ontap_lun_map.py
index 67acb4b3..843a983c 100644
--- a/plugins/modules/na_ontap_lun_map.py
+++ b/plugins/modules/na_ontap_lun_map.py
@@ -2,7 +2,7 @@
 
 """ this is lun mapping module
 
- (c) 2018-2023, NetApp, Inc
+ (c) 2018-2024, NetApp, Inc
  # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
 
@@ -55,25 +55,25 @@
 """
 
 EXAMPLES = """
-- name: Create LUN mapping
-  na_ontap_lun_map:
-    state: present
-    initiator_group_name: ansibleIgroup3234
-    path: /vol/iscsi_path/iscsi_lun
-    vserver: ci_dev
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-
-- name: Unmap LUN
-  na_ontap_lun_map:
-    state: absent
-    initiator_group_name: ansibleIgroup3234
-    path: /vol/iscsi_path/iscsi_lun
-    vserver: ci_dev
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
+    - name: Create LUN mapping
+      netapp.ontap.na_ontap_lun_map:
+        state: present
+        initiator_group_name: ansibleIgroup3234
+        path: /vol/iscsi_path/iscsi_lun
+        vserver: ci_dev
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Unmap LUN
+      netapp.ontap.na_ontap_lun_map:
+        state: absent
+        initiator_group_name: ansibleIgroup3234
+        path: /vol/iscsi_path/iscsi_lun
+        vserver: ci_dev
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_mcc_mediator.py b/plugins/modules/na_ontap_mcc_mediator.py
index 785ca54f..95854ff8 100644
--- a/plugins/modules/na_ontap_mcc_mediator.py
+++ b/plugins/modules/na_ontap_mcc_mediator.py
@@ -78,7 +78,6 @@
 """
 
 RETURN = """
-
 """
 
 from ansible.module_utils.basic import AnsibleModule
diff --git a/plugins/modules/na_ontap_metrocluster.py b/plugins/modules/na_ontap_metrocluster.py
index c6b2bfd1..bdb6a122 100644
--- a/plugins/modules/na_ontap_metrocluster.py
+++ b/plugins/modules/na_ontap_metrocluster.py
@@ -62,6 +62,11 @@
       - partner_node_name: rha17-a2
         node_name: rha17-b2
     partner_cluster_name: rha2-b2b1_siteB
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    https: true
+    validate_certs: false
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_metrocluster_dr_group.py b/plugins/modules/na_ontap_metrocluster_dr_group.py
index 070d36a6..b6ca77c4 100644
--- a/plugins/modules/na_ontap_metrocluster_dr_group.py
+++ b/plugins/modules/na_ontap_metrocluster_dr_group.py
@@ -64,6 +64,11 @@
       - partner_name: carchi_cluster3_01
         node_name: carchi_cluster1_01
     partner_cluster_name: carchi_cluster3
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    https: true
+    validate_certs: false
 
 - name: Delete MetroCluster DR group
   netapp.ontap.na_ontap_metrocluster_dr_group:
@@ -72,6 +77,11 @@
         node_name: carchi_cluster1_01
     state: absent
     partner_cluster_name: carchi_cluster3
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    https: true
+    validate_certs: false
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_ndmp.py b/plugins/modules/na_ontap_ndmp.py
index 0b116c83..27bba05f 100644
--- a/plugins/modules/na_ontap_ndmp.py
+++ b/plugins/modules/na_ontap_ndmp.py
@@ -165,6 +165,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
+    https: true
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_node.py b/plugins/modules/na_ontap_node.py
index f88a8827..35ee139a 100644
--- a/plugins/modules/na_ontap_node.py
+++ b/plugins/modules/na_ontap_node.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2018-2023, NetApp, Inc
+# (c) 2018-2024, NetApp, Inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
@@ -45,35 +45,34 @@
 '''
 
 EXAMPLES = """
-- name: modify node
-  na_ontap_node:
-    name: laurentncluster-2
-    location: SF1
-    asset_tag: mytag
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-
-- name: rename node
-  na_ontap_node:
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-    from_name: laurentn-vsim1
-    name: laurentncluster-2
-
-- name: modify and rename node
-  na_ontap_node:
-    hostname: "{{ netapp_hostname }}"
-    username: "{{ netapp_username }}"
-    password: "{{ netapp_password }}"
-    location: SF2
-    from_name: laurentn-vsim1
-    name: laurentncluster-2
+    - name: Modify node
+      netapp.ontap.na_ontap_node:
+        name: laurentncluster-2
+        location: SF1
+        asset_tag: mytag
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Rename node
+      netapp.ontap.na_ontap_node:
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+        from_name: laurentn-vsim1
+        name: laurentncluster-2
+
+    - name: Modify and rename node
+      netapp.ontap.na_ontap_node:
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+        location: SF2
+        from_name: laurentn-vsim1
+        name: laurentncluster-2
 """
 
 RETURN = """
-
 """
 import traceback
 
diff --git a/plugins/modules/na_ontap_ntfs_dacl.py b/plugins/modules/na_ontap_ntfs_dacl.py
index c7d7a2eb..04667625 100644
--- a/plugins/modules/na_ontap_ntfs_dacl.py
+++ b/plugins/modules/na_ontap_ntfs_dacl.py
@@ -88,10 +88,9 @@
     access_type: allow
     account: DOMAIN\\Account
     rights: modify
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify NTFS DACL
   netapp.ontap.na_ontap_ntfs_dacl:
@@ -101,9 +100,9 @@
     access_type: full_control
     account: DOMAIN\\Account
     rights: modify
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Remove NTFS DACL
   netapp.ontap.na_ontap_ntfs_dacl:
@@ -111,13 +110,12 @@
     vserver: SVM1
     security_descriptor: ansible_sd
     account: DOMAIN\\Account
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_ntfs_sd.py b/plugins/modules/na_ontap_ntfs_sd.py
index 75f38f42..f577931f 100644
--- a/plugins/modules/na_ontap_ntfs_sd.py
+++ b/plugins/modules/na_ontap_ntfs_sd.py
@@ -95,9 +95,9 @@
     owner: DOMAIN\\Account
     group: DOMAIN\\Group
     control_flags_raw: 0
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify NTFS Security Descriptor
   netapp.ontap.na_ontap_ntfs_sd:
@@ -107,22 +107,21 @@
     owner: DOMAIN\\Account
     group: DOMAIN\\Group
     control_flags_raw: 0
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Delete NTFS Security Descriptor
   netapp.ontap.na_ontap_ntfs_sd:
     state: absent
     vserver: SVM1
     name: ansible_sd
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 
 
diff --git a/plugins/modules/na_ontap_nvme.py b/plugins/modules/na_ontap_nvme.py
index 3d5fc02b..0ed729b3 100644
--- a/plugins/modules/na_ontap_nvme.py
+++ b/plugins/modules/na_ontap_nvme.py
@@ -38,26 +38,26 @@
     state: present
     status_admin: false
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify NVMe
   netapp.ontap.na_ontap_nvme:
     state: present
     status_admin: true
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Delete NVMe
   netapp.ontap.na_ontap_nvme:
     state: absent
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_nvme_namespace.py b/plugins/modules/na_ontap_nvme_namespace.py
index 4c34d654..3b8ba3bd 100644
--- a/plugins/modules/na_ontap_nvme_namespace.py
+++ b/plugins/modules/na_ontap_nvme_namespace.py
@@ -64,21 +64,9 @@
     size: 20
     size_unit: mb
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-
-- name: Create NVME Namespace (Idempotency)
-  netapp.ontap.na_ontap_nvme_namespace:
-    state: present
-    ostype: linux
-    path: /vol/ansible/test
-    size: 20
-    size_unit: mb
-    vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_nvme_subsystem.py b/plugins/modules/na_ontap_nvme_subsystem.py
index e9fa3ff7..9f94db72 100644
--- a/plugins/modules/na_ontap_nvme_subsystem.py
+++ b/plugins/modules/na_ontap_nvme_subsystem.py
@@ -92,9 +92,9 @@
     hosts: nqn.1992-08.com.netapp:sn.3017cfc1e2ba11e89c55005056b36338:subsystem.ansible
     paths: /vol/ansible/test,/vol/ansible/test1
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Modify NVME subsystem map
   netapp.ontap.na_ontap_nvme_subsystem:
diff --git a/plugins/modules/na_ontap_object_store.py b/plugins/modules/na_ontap_object_store.py
index 32b3e763..1a991d38 100644
--- a/plugins/modules/na_ontap_object_store.py
+++ b/plugins/modules/na_ontap_object_store.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2019-2021, NetApp, Inc
+# (c) 2019-2024, NetApp, Inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 '''
@@ -103,30 +103,29 @@
 '''
 
 EXAMPLES = """
-- name: object store Create
-  netapp.ontap.na_ontap_object_store:
-    state: present
-    name: ansible
-    provider_type: SGWS
-    server: abc
-    container: abc
-    access_key: s3.amazonaws.com
-    secret_password: abc
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
-
-- name: object store Create
-  netapp.ontap.na_ontap_object_store:
-    state: absent
-    name: ansible
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    - name: Object store Create
+      netapp.ontap.na_ontap_object_store:
+        state: present
+        name: ansible
+        provider_type: SGWS
+        server: abc
+        container: abc
+        access_key: s3.amazonaws.com
+        secret_password: abc
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
+
+    - name: Object store delete
+      netapp.ontap.na_ontap_object_store:
+        state: absent
+        name: ansible
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 import traceback
 
diff --git a/plugins/modules/na_ontap_partitions.py b/plugins/modules/na_ontap_partitions.py
index d27ade25..5b915a90 100644
--- a/plugins/modules/na_ontap_partitions.py
+++ b/plugins/modules/na_ontap_partitions.py
@@ -74,19 +74,19 @@
 '''
 
 EXAMPLES = """
-- name: Assign specified total partitions to node cluster-01
-  na_ontap_disk_partitions_custom:
-    node: cluster-01
-    partition_count: 56
-    disk_type: FSAS
-    partition_type: data
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
+    - name: Assign specified total partitions to node cluster-01
+      netapp.ontap.na_ontap_partitions:
+        node: cluster-01
+        partition_count: 56
+        disk_type: SSD
+        partition_type: data1
+        partition_method: root_data1_data2
+        hostname: "{{ netapp_hostname }}"
+        username: "{{ netapp_username }}"
+        password: "{{ netapp_password }}"
 """
 
 RETURN = """
-
 """
 
 from ansible.module_utils.basic import AnsibleModule
diff --git a/plugins/modules/na_ontap_ports.py b/plugins/modules/na_ontap_ports.py
index c55eafd1..1903259d 100644
--- a/plugins/modules/na_ontap_ports.py
+++ b/plugins/modules/na_ontap_ports.py
@@ -82,7 +82,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: false
+    https: true
 
 - name: Broadcast domain add port
   netapp.ontap.na_ontap_ports:
@@ -94,7 +94,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: false
+    https: true
 
 - name: Portset remove port
   netapp.ontap.na_ontap_ports:
@@ -106,7 +106,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: false
+    https: true
 
 - name: Portset add port
   netapp.ontap.na_ontap_ports:
@@ -119,7 +119,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: false
+    https: true
 '''
 
 RETURN = '''
diff --git a/plugins/modules/na_ontap_qos_policy_group.py b/plugins/modules/na_ontap_qos_policy_group.py
index ba34ee96..5160d59f 100644
--- a/plugins/modules/na_ontap_qos_policy_group.py
+++ b/plugins/modules/na_ontap_qos_policy_group.py
@@ -211,7 +211,7 @@
       max_throughput_mbps: 200
       min_throughput_iops: 500
       min_throughput_mbps: 100
-      capacity_shared: True
+      capacity_shared: true
 
 - name: Modify qos policy max_throughput in REST.
   netapp.ontap.na_ontap_qos_policy_group:
diff --git a/plugins/modules/na_ontap_quota_policy.py b/plugins/modules/na_ontap_quota_policy.py
index c31c80df..9c6615cc 100644
--- a/plugins/modules/na_ontap_quota_policy.py
+++ b/plugins/modules/na_ontap_quota_policy.py
@@ -92,7 +92,6 @@
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_rest_cli.py b/plugins/modules/na_ontap_rest_cli.py
index bbffea20..19e20ca7 100644
--- a/plugins/modules/na_ontap_rest_cli.py
+++ b/plugins/modules/na_ontap_rest_cli.py
@@ -24,12 +24,13 @@
 options:
   command:
     description:
-      - a string command.
+      - A CLI command.
     required: true
     type: str
   verb:
     description:
-      - a string indicating which api call to run
+      - Define which action to perform with the provided command.
+      - Values are mapped to show, create, modify, delete.
       - OPTIONS is useful to know which verbs are supported by the REST API
     choices: ['GET', 'POST', 'PATCH', 'DELETE', 'OPTIONS']
     required: true
@@ -45,32 +46,80 @@
 '''
 
 EXAMPLES = """
-- name: Run ontap rest cli command
+- name: Run ONTAP REST CLI command
   netapp.ontap.na_ontap_rest_cli:
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
-    command: 'version'
-    verb: 'GET'
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    command: version
+    verb: GET
+
+# The fields key allows returning a subset of parameters for a given object
+- name: Run volume show command with a filter to only return volumes matching the provided vserver and policy values.
+  netapp.ontap.na_ontap_rest_cli:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    command: volume
+    verb: GET
+    params:
+      vserver: vs0
+      policy: default
+      fields: vserver,volume,policy
+  register: vs0_volumes
 
-- name: Run ontap rest cli command
+- name: Run security login motd modify command
   netapp.ontap.na_ontap_rest_cli:
-    hostname: "{{ hostname }}"
-    username: "{{ admin username }}"
-    password: "{{ admin password }}"
-    command: 'security/login/motd'
-    verb: 'PATCH'
-    params: {'vserver': 'ansibleSVM'}
-    body: {'message': 'test'}
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    command: security/login/motd
+    verb: PATCH
+    params:
+      vserver: ansibleSVM
+    body:
+      message: test
 
 - name: Set option
   netapp.ontap.na_ontap_rest_cli:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
     command: options
     verb: PATCH
     params:
       option_name: lldp.enable
     body:
       option_value: "on"
+
+- name: Run security certificate delete command
+  netapp.ontap.na_ontap_rest_cli:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    command: security/certificate
+    verb: DELETE
+    body:
+      vserver: vs1
+      common-name: cluster01
+      ca: cluster01
+      type: server
+      serial: 17EBE9D26GGE91B9
+
+- name: Run volume create command
+  netapp.ontap.na_ontap_rest_cli:
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
+    command: volume
+    verb: POST
+    body:
+      vserver: vs1
+      volume: my_test_volume
+      size: 10g
+      aggregate: aggr1_node1
+      policy: default
+      type: RW
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_rest_info.py b/plugins/modules/na_ontap_rest_info.py
index f02a9d12..98c31f37 100644
--- a/plugins/modules/na_ontap_rest_info.py
+++ b/plugins/modules/na_ontap_rest_info.py
@@ -323,9 +323,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
-    use_rest: always
     gather_subset:
       - svm/svms
 
@@ -334,9 +332,7 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
-    use_rest: always
     gather_subset:
       - storage/aggregates
       - storage/volumes
@@ -346,11 +342,9 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     fields:
       - '*'
     validate_certs: false
-    use_rest: always
     gather_subset:
       - storage/aggregates
       - storage/volumes
@@ -360,13 +354,11 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     fields:
       - 'uuid'
       - 'name'
       - 'node'
     validate_certs: false
-    use_rest: always
     gather_subset:
       - storage/aggregates
     parameters:
@@ -378,11 +370,9 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     fields:
       - '*'
     validate_certs: false
-    use_rest: always
     gather_subset:
       - storage/volumes/snapshots
     owning_resource:
@@ -394,7 +384,6 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
     gather_subset:
       - storage/volumes
@@ -407,7 +396,6 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
     gather_subset:
       - file_directory_security
@@ -416,12 +404,11 @@
       path: /vol1/qtree1
     use_python_keys: true
 
-- name: Get ip network interface info.
+- name: Get ip network interface info
   netapp.ontap.na_ontap_rest_info:
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
     gather_subset:
       - ip_interfaces_info
@@ -435,7 +422,6 @@
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
     password: "{{ netapp_password }}"
-    https: true
     validate_certs: false
     gather_subset:
       - aggregate_info
diff --git a/plugins/modules/na_ontap_snapmirror_policy.py b/plugins/modules/na_ontap_snapmirror_policy.py
index e6e95a65..897c2cfc 100644
--- a/plugins/modules/na_ontap_snapmirror_policy.py
+++ b/plugins/modules/na_ontap_snapmirror_policy.py
@@ -294,7 +294,6 @@
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_storage_auto_giveback.py b/plugins/modules/na_ontap_storage_auto_giveback.py
index 8706eaf3..26782872 100644
--- a/plugins/modules/na_ontap_storage_auto_giveback.py
+++ b/plugins/modules/na_ontap_storage_auto_giveback.py
@@ -61,7 +61,6 @@
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_storage_failover.py b/plugins/modules/na_ontap_storage_failover.py
index bcf79449..36a1f567 100644
--- a/plugins/modules/na_ontap_storage_failover.py
+++ b/plugins/modules/na_ontap_storage_failover.py
@@ -53,7 +53,6 @@
 """
 
 RETURN = """
-
 """
 
 import traceback
diff --git a/plugins/modules/na_ontap_unix_user.py b/plugins/modules/na_ontap_unix_user.py
index aa7b8361..03b77891 100644
--- a/plugins/modules/na_ontap_unix_user.py
+++ b/plugins/modules/na_ontap_unix_user.py
@@ -98,7 +98,6 @@
 """
 
 RETURN = """
-
 """
 import traceback
 
diff --git a/plugins/modules/na_ontap_user.py b/plugins/modules/na_ontap_user.py
index ff06b65b..bd7d70a7 100644
--- a/plugins/modules/na_ontap_user.py
+++ b/plugins/modules/na_ontap_user.py
@@ -241,9 +241,9 @@
     engine_id: '7063514941000000000000'
     remote_switch_ipaddress: 10.0.0.0
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 
 - name: Create user
   netapp.ontap.na_ontap_user:
@@ -257,9 +257,9 @@
     role_name: vsadmin
     set_password: bobdole1234566
     vserver: "{{ vserver }}"
-    hostname: "{{ hostname }}"
-    username: "{{ username }}"
-    password: "{{ password }}"
+    hostname: "{{ netapp_hostname }}"
+    username: "{{ netapp_username }}"
+    password: "{{ netapp_password }}"
 """
 
 RETURN = """
diff --git a/plugins/modules/na_ontap_vscan_scanner_pool.py b/plugins/modules/na_ontap_vscan_scanner_pool.py
index 831ae725..d1b6e2ac 100644
--- a/plugins/modules/na_ontap_vscan_scanner_pool.py
+++ b/plugins/modules/na_ontap_vscan_scanner_pool.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# (c) 2018-2023, NetApp, Inc
+# (c) 2018-2024, NetApp, Inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 '''
@@ -65,7 +65,7 @@
 
 EXAMPLES = """
 - name: Create and enable Scanner pool
-  na_ontap_vscan_scanner_pool:
+  netapp.ontap.na_ontap_vscan_scanner_pool:
     state: present
     username: '{{ netapp_username }}'
     password: '{{ netapp_password }}'
@@ -77,7 +77,7 @@
     scanner_policy: primary
 
 - name: Modify scanner pool
-  na_ontap_vscan_scanner_pool:
+  netapp.ontap.na_ontap_vscan_scanner_pool:
     state: present
     username: '{{ netapp_username }}'
     password: '{{ netapp_password }}'
@@ -88,7 +88,7 @@
     scanner_pool: Scanner1
 
 - name: Delete a scanner pool
-  na_ontap_vscan_scanner_pool:
+  netapp.ontap.na_ontap_vscan_scanner_pool:
     state: absent
     username: '{{ netapp_username }}'
     password: '{{ netapp_password }}'
diff --git a/plugins/modules/na_ontap_wait_for_condition.py b/plugins/modules/na_ontap_wait_for_condition.py
index ac490828..a8b7faf7 100644
--- a/plugins/modules/na_ontap_wait_for_condition.py
+++ b/plugins/modules/na_ontap_wait_for_condition.py
@@ -62,7 +62,7 @@
 '''
 
 EXAMPLES = """
-- name: wait for sp_upgrade in progress
+- name: Wait for sp_upgrade in progress
   netapp.ontap.na_ontap_wait_for_condition:
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
@@ -76,7 +76,7 @@
     polling_interval: 30
     timeout: 1800
 
-- name: wait for sp_upgrade not in progress
+- name: Wait for sp_upgrade not in progress
   netapp.ontap.na_ontap_wait_for_condition:
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
@@ -91,7 +91,7 @@
     polling_interval: 30
     timeout: 1800
 
-- name: wait for sp_version to match 3.9
+- name: Wait for sp_version to match 3.9
   netapp.ontap.na_ontap_wait_for_condition:
     hostname: "{{ netapp_hostname }}"
     username: "{{ netapp_username }}"
diff --git a/plugins/modules/na_ontap_zapit.py b/plugins/modules/na_ontap_zapit.py
index 9f992167..6da44008 100644
--- a/plugins/modules/na_ontap_zapit.py
+++ b/plugins/modules/na_ontap_zapit.py
@@ -45,9 +45,9 @@
   gather_facts: false
   vars:
     login: &login
-      hostname: "{{ admin_ip }}"
-      username: "{{ admin_username }}"
-      password: "{{ admin_password }}"
+      hostname: "{{ netapp_hostname }}"
+      username: "{{ netapp_username }}"
+      password: "{{ netapp_password }}"
       https: true
       validate_certs: false
     svm_login: &svm_login