diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attribute_defs.py b/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attribute_defs.py
index d517081d68f..41e60a7bacb 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attribute_defs.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attribute_defs.py
@@ -23,7 +23,7 @@ description:
     - This module can be used to add and remove custom attributes definitions for the given virtual machine from VMWare.
 version_added: 2.7
 author:
-    - Jimmy Conner
+    - Jimmy Conner (@cigamit)
     - Abhijeet Kasurde (@Akasurde)
 notes:
     - Tested on vSphere 6.5
diff --git a/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attributes.py b/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attributes.py
index 9a5cd686171..356a453ecb4 100644
--- a/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attributes.py
+++ b/lib/ansible/modules/cloud/vmware/vmware_guest_custom_attributes.py
@@ -25,7 +25,7 @@ description:
     - This module can be used to add, remove and update custom attributes for the given virtual machine.
 version_added: 2.7
 author:
-    - Jimmy Conner
+    - Jimmy Conner (@cigamit)
     - Abhijeet Kasurde (@Akasurde)
 notes:
     - Tested on vSphere 6.5
diff --git a/lib/ansible/modules/monitoring/pagerduty.py b/lib/ansible/modules/monitoring/pagerduty.py
index e13d0b4a391..8a7c07acf05 100644
--- a/lib/ansible/modules/monitoring/pagerduty.py
+++ b/lib/ansible/modules/monitoring/pagerduty.py
@@ -24,7 +24,7 @@ author:
     - "Andrew Newdigate (@suprememoocow)"
     - "Dylan Silva (@thaumos)"
     - "Justin Johns"
-    - "Bruce Pennypacker"
+    - "Bruce Pennypacker (@bpennypacker)"
 requirements:
     - PagerDuty API access
 options:
diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py b/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
index ad43fa6798a..afaa5a631e3 100644
--- a/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
+++ b/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
@@ -21,7 +21,7 @@ description:
    - manages Zabbix host macros, it can create, update or delete them.
 version_added: "2.0"
 author:
-    - "(@cave)"
+    - "Cove (@cove)"
     - Dean Hailin Song
 requirements:
     - "python >= 2.6"
diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_screen.py b/lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
index 3e8238b844c..98df31f5539 100644
--- a/lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
+++ b/lib/ansible/modules/monitoring/zabbix/zabbix_screen.py
@@ -21,7 +21,7 @@ description:
     - This module allows you to create, modify and delete Zabbix screens and associated graph data.
 version_added: "2.0"
 author:
-    - "(@cove)"
+    - "Cove (@cove)"
     - "Tony Minfei Ding"
     - "Harrison Gu (@harrisongu)"
 requirements:
diff --git a/lib/ansible/modules/packaging/language/pear.py b/lib/ansible/modules/packaging/language/pear.py
index f18dd438c3d..7333ee2c954 100644
--- a/lib/ansible/modules/packaging/language/pear.py
+++ b/lib/ansible/modules/packaging/language/pear.py
@@ -24,7 +24,7 @@ description:
     - Manage PHP packages with the pear package manager.
 version_added: 2.0
 author:
-    - "'jonathan.lestrelin' <jonathan.lestrelin@gmail.com>"
+    - Jonathan Lestrelin (@jle64) <jonathan.lestrelin@gmail.com>
 options:
     name:
         description:
diff --git a/lib/ansible/modules/packaging/os/pacman.py b/lib/ansible/modules/packaging/os/pacman.py
index 0bc16da8cf5..576ef48c7bc 100644
--- a/lib/ansible/modules/packaging/os/pacman.py
+++ b/lib/ansible/modules/packaging/os/pacman.py
@@ -23,7 +23,7 @@ version_added: "1.0"
 author:
     - Indrajit Raychaudhuri (@indrajitr)
     - Aaron Bull Schaefer (@elasticdog) <aaron@elasticdog.com>
-    - Afterburn
+    - Kevin Karsopawiro (@Afterburn)
     - Maxime de Roucy (@tchernomax)
 options:
     name:
diff --git a/lib/ansible/modules/source_control/git_config.py b/lib/ansible/modules/source_control/git_config.py
index 5e36da98baa..28d0f77d4d8 100644
--- a/lib/ansible/modules/source_control/git_config.py
+++ b/lib/ansible/modules/source_control/git_config.py
@@ -20,7 +20,7 @@ DOCUMENTATION = '''
 module: git_config
 author:
   - Matthew Gamble (@djmattyg007)
-  - Marius Gedminas
+  - Marius Gedminas (@mgedmin)
 version_added: 2.1
 requirements: ['git']
 short_description: Read and write git configuration
diff --git a/lib/ansible/modules/system/cron.py b/lib/ansible/modules/system/cron.py
index d2dc29835bf..8fa1d516343 100644
--- a/lib/ansible/modules/system/cron.py
+++ b/lib/ansible/modules/system/cron.py
@@ -129,7 +129,7 @@ requirements:
 author:
     - Dane Summers (@dsummersl)
     - Mike Grozak
-    - Patrick Callahan
+    - Patrick Callahan (@dirtyharrycallahan)
     - Evan Kaufman (@EvanK)
     - Luca Berruti (@lberruti)
 """