diff --git a/lib/ansible/modules/cloud/amazon/aws_sgw_facts.py b/lib/ansible/modules/cloud/amazon/aws_sgw_facts.py
index 76b0256fce..fdfe8f5320 100644
--- a/lib/ansible/modules/cloud/amazon/aws_sgw_facts.py
+++ b/lib/ansible/modules/cloud/amazon/aws_sgw_facts.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
-# Copyright (c) 2018 Loic BLOT <loic.blot@unix-experience.fr>
-# This module is sponsored by E.T.A.I. (www.etai.fr)
+
+# Copyright: (c) 2018, Loic BLOT (@nerzhul) <loic.blot@unix-experience.fr>
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
+# This module is sponsored by E.T.A.I. (www.etai.fr)
+
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
                     'supported_by': 'community'}
@@ -15,7 +17,7 @@ description:
     - Fetch AWS Storage Gateway facts
 version_added: "2.6"
 requirements: [ boto3 ]
-author: "Loic Blot <loic.blot@unix-experience.fr>"
+author: Loic Blot (@nerzhul) <loic.blot@unix-experience.fr>
 options:
   gather_local_disks:
     description:
diff --git a/lib/ansible/modules/cloud/amazon/ec2_asg_lifecycle_hook.py b/lib/ansible/modules/cloud/amazon/ec2_asg_lifecycle_hook.py
index 54edfd6e45..c23fe75204 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_asg_lifecycle_hook.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_asg_lifecycle_hook.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-# Copyright (c) 2017 Ansible Project
+
+# Copyright: (c) 2017, Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 ANSIBLE_METADATA = {'status': ['preview'],
@@ -15,7 +16,7 @@ description:
   - In case Hook found, but provided parameters are differes, will update existing Hook.
   - In case state=absent and Hook exists, will delete it.
 version_added: "2.5"
-author: "Igor (Tsigankov) Eyrich (@tsiganenok) <tsiganenok@gmail.com>"
+author: Igor 'Tsigankov' Eyrich (@tsiganenok) <tsiganenok@gmail.com>
 options:
   state:
     description:
diff --git a/lib/ansible/modules/cloud/amazon/ec2_snapshot_copy.py b/lib/ansible/modules/cloud/amazon/ec2_snapshot_copy.py
index b51852d6df..fd9a5d2ff5 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_snapshot_copy.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_snapshot_copy.py
@@ -1,5 +1,6 @@
 #!/usr/bin/python
-# Copyright (c) 2017 Ansible Project
+
+# Copyright: (c) 2017, Ansible Project
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 ANSIBLE_METADATA = {
@@ -49,7 +50,7 @@ options:
   tags:
     description:
       - A hash/dictionary of tags to add to the new Snapshot; '{"key":"value"}' and '{"key":"value","key":"value"}'
-author: "Deepak Kothandan <deepak.kdy@gmail.com>"
+author: Deepak Kothandan (@Deepakkothandan) <deepak.kdy@gmail.com>
 extends_documentation_fragment:
     - aws
     - ec2
diff --git a/lib/ansible/modules/cloud/openstack/os_floating_ip.py b/lib/ansible/modules/cloud/openstack/os_floating_ip.py
index 60158891d1..ef95c4d9b0 100644
--- a/lib/ansible/modules/cloud/openstack/os_floating_ip.py
+++ b/lib/ansible/modules/cloud/openstack/os_floating_ip.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
-# Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
-# Author: Davide Guerri <davide.guerri@hp.com>
+
+# Copyright: (c) 2015, Hewlett-Packard Development Company, L.P.
 # 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
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: os_floating_ip
 version_added: "2.0"
-author: "Davide Guerri <davide.guerri@hp.com>"
+author: Davide Guerri (@dguerri) <davide.guerri@hp.com>
 short_description: Add/Remove floating IP from an instance
 extends_documentation_fragment: openstack
 description:
diff --git a/lib/ansible/modules/database/postgresql/postgresql_schema.py b/lib/ansible/modules/database/postgresql/postgresql_schema.py
index 6c2ce18986..a3f7c2e842 100644
--- a/lib/ansible/modules/database/postgresql/postgresql_schema.py
+++ b/lib/ansible/modules/database/postgresql/postgresql_schema.py
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-# Copyright: Ansible Project
+
+# Copyright: (c) 2016, Ansible Project
 # 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
@@ -59,7 +60,7 @@ notes:
      on the remote host. For Ubuntu-based systems, install the C(postgresql), C(libpq-dev), and C(python-psycopg2) packages on the remote host before
      using this module.
 requirements: [ psycopg2 ]
-author: "Flavien Chantelot <contact@flavien.io>"
+author: Flavien Chantelot (@Dorn-) <contact@flavien.io>
 '''
 
 EXAMPLES = '''