diff --git a/README-automember.md b/README-automember.md
index 42fc4aca3758a7fb26d871a099ccc2ffa3111c30..1519689b4546e1b0edf91ed425ebcf8c4675162d 100644
--- a/README-automember.md
+++ b/README-automember.md
@@ -115,9 +115,6 @@ Example playbook to add an inclusive condition to an existing rule
 Variables
 ---------
 
-ipaautomember
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-automountlocation.md b/README-automountlocation.md
index 6acb4f5b8fc0be75efe712ac14cfec22ea64e289..1bf14780853055a190074a6cb51cdb96aba91912 100644
--- a/README-automountlocation.md
+++ b/README-automountlocation.md
@@ -97,9 +97,6 @@ Example playbook to ensure absence of an automount location:
 Variables
 =========
 
-ipaautomountlocation
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-config.md b/README-config.md
index 86859471c4dcfa262bb8f39438723a4d51ec10aa..17c85f1b537ea49f969c8b6fb289971bde138661 100644
--- a/README-config.md
+++ b/README-config.md
@@ -82,9 +82,6 @@ Example playbook to read config options:
 Variables
 =========
 
-ipauser
--------
-
 **General Variables:**
 
 Variable | Description | Required
diff --git a/README-delegation.md b/README-delegation.md
index 643a1633957cab6dfdaa373d4d2f7108c6930c69..4260ed0620e1813010935605242742ae65e7d266 100644
--- a/README-delegation.md
+++ b/README-delegation.md
@@ -135,9 +135,6 @@ Example playbook to make sure delegation "basic manager attributes" is absent:
 Variables
 ---------
 
-ipadelegation
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-dnsconfig.md b/README-dnsconfig.md
index 33ed76f529837f7942aca02b6f1d26cfc19136b9..976251bbb7234d260c714fc8c663661ee6ec0d7b 100644
--- a/README-dnsconfig.md
+++ b/README-dnsconfig.md
@@ -119,9 +119,6 @@ Example playbook to disallow synchronization of forward (A, AAAA) and reverse (P
 Variables
 =========
 
-ipadnsconfig
-------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-dnsforwardzone.md b/README-dnsforwardzone.md
index e1ff1db0f97af6906d9a37924ab14b211a4cf246..9274698448cbb485dcf65842dfa7338c9a48b7ad 100644
--- a/README-dnsforwardzone.md
+++ b/README-dnsforwardzone.md
@@ -100,9 +100,6 @@ Example playbook to ensure presence of a forwardzone to ipa DNS:
 Variables
 =========
 
-ipagroup
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-dnsrecord.md b/README-dnsrecord.md
index 99beffbb981270571346732e2b7f3d03c1b17f7d..69838f911951225f13418fe6317c56dce8e5c93b 100644
--- a/README-dnsrecord.md
+++ b/README-dnsrecord.md
@@ -242,9 +242,6 @@ Example playbook to ensure multiple DNS records are absent:
 Variables
 =========
 
-ipadnsrecord
-------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-dnszone.md b/README-dnszone.md
index 4118a97a21025217c58370e3f9b0efa20db0d853..e6673dc003f67d5c72add73972a7ae174325f932 100644
--- a/README-dnszone.md
+++ b/README-dnszone.md
@@ -195,9 +195,6 @@ Example playbook to create a zone for reverse DNS lookup, from an IP address, gi
 Variables
 =========
 
-ipadnszone
-----------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
@@ -233,9 +230,6 @@ Variable | Description | Required
 Return Values
 =============
 
-ipadnszone
-----------
-
 Variable | Description | Returned When
 -------- | ----------- | -------------
 `dnszone` | DNS Zone dict with zone name infered from `name_from_ip`. <br>Options: |  If `state` is `present`, `name_from_ip` is used, and a zone was created.
diff --git a/README-group.md b/README-group.md
index c3a27002dd0c14b40cc1e529e28c76b9a00504ee..7d263612389e01d0a3313e5cf194e7e858ae4d03 100644
--- a/README-group.md
+++ b/README-group.md
@@ -147,9 +147,6 @@ Example playbook to remove groups:
 Variables
 =========
 
-ipagroup
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-hbacrule.md b/README-hbacrule.md
index d246c8c9e0fe464a95941ccd9596381b3632f80a..c60d4d6662a5c14ccf5687cea680006625c1e18b 100644
--- a/README-hbacrule.md
+++ b/README-hbacrule.md
@@ -129,9 +129,6 @@ Example playbook to make sure HBAC Rule login is absent:
 Variables
 =========
 
-ipahbacrule
----------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-hbacsvc.md b/README-hbacsvc.md
index 21d0f735895d5029479268a9ea1062144664511e..bf4a836cc448ed34dffa14dc31ab0ee28e43cecd 100644
--- a/README-hbacsvc.md
+++ b/README-hbacsvc.md
@@ -91,9 +91,6 @@ Example playbook to make sure HBAC Services for http and tftp are absent
 Variables
 =========
 
-ipahbacsvc
-----------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-hbacsvcgroup.md b/README-hbacsvcgroup.md
index 4c9cb1188e8a8d34f2a6f42c3b4db5fab7e9fdd5..09f0f75eb094d728029c30877590c24540addbff 100644
--- a/README-hbacsvcgroup.md
+++ b/README-hbacsvcgroup.md
@@ -129,9 +129,6 @@ Example playbook to make sure HBAC Service Group login is absent:
 Variables
 =========
 
-ipahbacsvcgroup
----------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-host.md b/README-host.md
index 064b2478619457829df6a69a9a8c6b22363496a0..10b1f8295cb58900bba1c260a62d2e6983444c2f 100644
--- a/README-host.md
+++ b/README-host.md
@@ -313,9 +313,6 @@ Example playbook to ensure a host is absent:
 Variables
 =========
 
-ipahost
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
@@ -370,9 +367,6 @@ Variable | Description | Required
 Return Values
 =============
 
-ipahost
--------
-
 There are only return values if one or more random passwords have been generated.
 
 Variable | Description | Returned When
diff --git a/README-hostgroup.md b/README-hostgroup.md
index 9c50a2710c4daf3ef4543c80cdc4669c1afc693f..a06e2146ac44493563e97e62ad1e6683a369d2b9 100644
--- a/README-hostgroup.md
+++ b/README-hostgroup.md
@@ -143,9 +143,6 @@ Example playbook to make sure host-group databases is absent:
 Variables
 =========
 
-ipahostgroup
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-location.md b/README-location.md
index f551632fcb1c6f7d30ad5ab9e0552a8ea9bf5976..e8ce363ce184cba2f5b67e3d3ad4f2357cfee5c3 100644
--- a/README-location.md
+++ b/README-location.md
@@ -74,9 +74,6 @@ Example playbook to make sure location "my_location1" is absent:
 Variables
 ---------
 
-ipalocation
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-permission.md b/README-permission.md
index 88f1c410a33cf3845f81217d3a366ad6ccf18eba..d571e0b084ad3905e1ced1c2af589d9ba5df4870 100644
--- a/README-permission.md
+++ b/README-permission.md
@@ -154,9 +154,6 @@ Example playbook to make sure permission "MyPermission" is renamed to "MyNewPerm
 Variables
 ---------
 
-ipapermission
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-privilege.md b/README-privilege.md
index ae02ff7a6dc09bb8aa791463b7f0087fa8a6975c..593929e0b9555048868f3507e3c10d6036a3ac69 100644
--- a/README-privilege.md
+++ b/README-privilege.md
@@ -126,9 +126,6 @@ Example playbook to make sure privilege "DNS Special Privilege" is absent:
 Variables
 ---------
 
-ipaprivilege
-------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin`. | no
diff --git a/README-pwpolicy.md b/README-pwpolicy.md
index 4aefe998dc3357b7fe8b2c9b9f02c4a6d03b7a5a..7e1eb8982766be7bba90e92d367ebf020ab69dd8 100644
--- a/README-pwpolicy.md
+++ b/README-pwpolicy.md
@@ -91,9 +91,6 @@ Example playbook to ensure maxlife is set to 49 in global policy:
 Variables
 =========
 
-ipapwpolicy
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-role.md b/README-role.md
index fb9e2799bfcc5e236cc8ee510efcd8b807e4d703..aa569f11b33250c5201fd39a353e937e9edbe188 100644
--- a/README-role.md
+++ b/README-role.md
@@ -238,9 +238,6 @@ Example playbook to ensure that different members are not associated with a role
 Variables
 ---------
 
-iparole
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-selfservice.md b/README-selfservice.md
index 87a83591be6a423c8d55e289601f5af72bc19ba9..8dc0f5579a2e2e546234a9fb088559653e545886 100644
--- a/README-selfservice.md
+++ b/README-selfservice.md
@@ -131,9 +131,6 @@ Example playbook to make sure selfservice "Users can manage their own name detai
 Variables
 ---------
 
-ipaselfservice
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-server.md b/README-server.md
index d1a4f78f7a60ba406ee211279c4ff43c4e6cc41e..f4c46bd85fe47b065863b79806ea665e108908f4 100644
--- a/README-server.md
+++ b/README-server.md
@@ -242,9 +242,6 @@ This task will always report a change.
 Variables
 ---------
 
-ipaserver
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-service.md b/README-service.md
index f59b083fcf9ad62863406630e18d1a62c4b11633..666c18936742aac57dc9333ba0a3999724199f7c 100644
--- a/README-service.md
+++ b/README-service.md
@@ -285,8 +285,6 @@ Example playbook to allow users, groups, hosts or hostgroups to retrieve a keyta
 Variables
 ---------
 
-ipaservice
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-sudocmd.md b/README-sudocmd.md
index 7c548f32d29db954fdad02278890a74cf65cf8f6..6c4793522bee44d86a3e61f25380b7fd1ad0ff2b 100644
--- a/README-sudocmd.md
+++ b/README-sudocmd.md
@@ -76,9 +76,6 @@ Example playbook to make sure sudocmd is absent:
 Variables
 =========
 
-ipasudocmd
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-sudocmdgroup.md b/README-sudocmdgroup.md
index 0b1bd534a6f8f9ac6bad298042af46c8650e9061..dea3c1acf71bd4221fa30e79a2115242d8c726f0 100644
--- a/README-sudocmdgroup.md
+++ b/README-sudocmdgroup.md
@@ -116,9 +116,6 @@ Example playbook to make sure sudocmdgroup is absent:
 Variables
 =========
 
-ipasudocmdgroup
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-sudorule.md b/README-sudorule.md
index 28d8ab0b88a194f320df01030d03dc9beb429f9b..089adab21eddfd73f8e26fdc23a5d22ac3400844 100644
--- a/README-sudorule.md
+++ b/README-sudorule.md
@@ -113,9 +113,6 @@ Example playbook to make sure Sudo Rule is absent:
 Variables
 =========
 
-ipasudorule
----------------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-trust.md b/README-trust.md
index c182fa8cf401d24ce608c48d843e0f24b0f829e2..ef04f6cb4930f88de223807b2db376e9e06a9819 100644
--- a/README-trust.md
+++ b/README-trust.md
@@ -94,9 +94,6 @@ This will only delete the ipa-side of the trust and it does NOT delete the id-ra
 Variables
 =========
 
-ipatrust
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/README-user.md b/README-user.md
index 2f73d91015723f67e3c0fd809521f39c55e3b771..6cb3e62908ec2ffba6f0533d888bf1d94da1e5db 100644
--- a/README-user.md
+++ b/README-user.md
@@ -356,9 +356,6 @@ Example playbook to ensure users are absent:
 Variables
 =========
 
-ipauser
--------
-
 **General Variables:**
 
 Variable | Description | Required
@@ -432,9 +429,6 @@ Variable | Description | Required
 Return Values
 =============
 
-ipauser
--------
-
 There are only return values if one or more random passwords have been generated.
 
 Variable | Description | Returned When
diff --git a/README-vault.md b/README-vault.md
index a18079f011624ffb840d6b0783779d45309a93a9..b2d3b89f1ea65e1602f99d5c84860a841bbd6667 100644
--- a/README-vault.md
+++ b/README-vault.md
@@ -210,9 +210,6 @@ Example playbook to make sure vault is absent:
 Variables
 =========
 
-ipavault
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
@@ -250,9 +247,6 @@ Variable | Description | Required
 Return Values
 =============
 
-ipavault
---------
-
 There is only a return value if `state` is `retrieved`.
 
 Variable | Description | Returned When
diff --git a/utils/templates/README-module+member.md.in b/utils/templates/README-module+member.md.in
index 074ea4ec1888df763c6e151146dcaf49fb33d2e3..4ed0d1d1edb9be83d736d46b5ef67a44f6eba472 100644
--- a/utils/templates/README-module+member.md.in
+++ b/utils/templates/README-module+member.md.in
@@ -112,9 +112,6 @@ MORE EXAMPLE PLAYBOOKS HERE
 Variables
 ---------
 
-ipa$name
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no
diff --git a/utils/templates/README-module.md.in b/utils/templates/README-module.md.in
index 25c69e4dd7e7c2b681192acd27f8e75abedbd13c..44f291e31a2ec3975a6c2ebb1cc609676377bc14 100644
--- a/utils/templates/README-module.md.in
+++ b/utils/templates/README-module.md.in
@@ -77,9 +77,6 @@ MORE EXAMPLE PLAYBOOKS HERE
 Variables
 ---------
 
-ipa$name
--------
-
 Variable | Description | Required
 -------- | ----------- | --------
 `ipaadmin_principal` | The admin principal is a string and defaults to `admin` | no