diff --git a/cloud/amazon/_ec2_ami_search.py b/cloud/amazon/_ec2_ami_search.py
index 8ef0c0046ea..a85bdf00223 100644
--- a/cloud/amazon/_ec2_ami_search.py
+++ b/cloud/amazon/_ec2_ami_search.py
@@ -66,7 +66,7 @@ options:
     default: paravirtual
     choices: ["paravirtual", "hvm"]
 
-author: Lorin Hochstein
+author: "Ansible Core Team (deprecated)"
 '''
 
 EXAMPLES = '''
diff --git a/cloud/amazon/ec2_eip.py b/cloud/amazon/ec2_eip.py
index 020ec67a497..69d762c8c08 100644
--- a/cloud/amazon/ec2_eip.py
+++ b/cloud/amazon/ec2_eip.py
@@ -61,7 +61,6 @@ options:
 extends_documentation_fragment:
     - aws
     - ec2
-author: "Lorin Hochstein (@lorin) <lorin@nimbisservices.com>"
 author: "Rick Mendes (@rickmendes) <rmendes@illumina.com>"
 notes:
    - This module will return C(public_ip) on success, which will contain the
diff --git a/cloud/amazon/s3.py b/cloud/amazon/s3.py
index fdeaafd58bd..ada5cd51c84 100644
--- a/cloud/amazon/s3.py
+++ b/cloud/amazon/s3.py
@@ -146,7 +146,6 @@ options:
 requirements: [ "boto" ]
 author:
     - "Lester Wade (@lwade)"
-    - "Ralph Tice (@ralph-tice)"
 extends_documentation_fragment: aws
 '''
 
diff --git a/cloud/openstack/_keystone_user.py b/cloud/openstack/_keystone_user.py
index 48cc87b241a..9586b8b70a9 100644
--- a/cloud/openstack/_keystone_user.py
+++ b/cloud/openstack/_keystone_user.py
@@ -90,7 +90,7 @@ options:
 requirements:
     - "python >= 2.6"
     -  python-keystoneclient
-author: "Lorin Hochstein (@lorin)"
+author: "Ansible Core Team (deprecated)"
 '''
 
 EXAMPLES = '''
diff --git a/database/postgresql/postgresql_db.py b/database/postgresql/postgresql_db.py
index 469d68fa0fa..762cb65e922 100644
--- a/database/postgresql/postgresql_db.py
+++ b/database/postgresql/postgresql_db.py
@@ -95,7 +95,7 @@ notes:
    - This module uses I(psycopg2), a Python PostgreSQL database adapter. You must ensure that psycopg2 is installed on
      the host before using this module. If the remote host is the PostgreSQL server (which is the default case), then PostgreSQL must also be installed 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: "Lorin Hochstein (@lorin)"
+author: "Ansible Core Team"
 '''
 
 EXAMPLES = '''
diff --git a/database/postgresql/postgresql_user.py b/database/postgresql/postgresql_user.py
index cee5a9ae131..4f2174330f6 100644
--- a/database/postgresql/postgresql_user.py
+++ b/database/postgresql/postgresql_user.py
@@ -137,7 +137,7 @@ notes:
      to all users. You may not specify password or role_attr_flags when the
      PUBLIC user is specified.
 requirements: [ psycopg2 ]
-author: "Lorin Hochstein (@lorin)"
+author: "Ansible Core Team"
 '''
 
 EXAMPLES = '''
diff --git a/system/authorized_key.py b/system/authorized_key.py
index 361e68cb009..8a97722b222 100644
--- a/system/authorized_key.py
+++ b/system/authorized_key.py
@@ -82,7 +82,7 @@ options:
     version_added: "1.9"
 description:
     - "Adds or removes authorized keys for particular user accounts"
-author: "Brad Olson (@bradobro)"
+author: "Ansible Core Team"
 '''
 
 EXAMPLES = '''
diff --git a/web_infrastructure/htpasswd.py b/web_infrastructure/htpasswd.py
index 361a131ef2d..4253f1572ac 100644
--- a/web_infrastructure/htpasswd.py
+++ b/web_infrastructure/htpasswd.py
@@ -69,7 +69,7 @@ notes:
   - "On Debian, Ubuntu, or Fedora: install I(python-passlib)."
   - "On RHEL or CentOS: Enable EPEL, then install I(python-passlib)."
 requires: [ passlib>=1.6 ]
-author: "Lorin Hochstein (@lorin)"
+author: "Ansible Core Team"
 """
 
 EXAMPLES = """