diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index e4bd2779ac..ba8b2878ac 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -36,353 +36,143 @@ automerge: True
 files:
   .github/BOTMETA.yml:
     labels: botmeta
-  $modules/cloud/amazon/aws_api_gateway.py: mikedlr willthames
-  $modules/cloud/amazon/aws_direct_connect_connection.py: s-hertel
-  $modules/cloud/amazon/aws_direct_connect_link_aggregation_group.py: s-hertel
+  $modules/cloud/amazon/:
+    ignored: erydo seiffert simplesteph
+  $modules/cloud/amazon/aws_api_gateway.py: willthames
   $modules/cloud/amazon/aws_kms.py: willthames
-  $modules/cloud/amazon/aws_waf_facts.py: willthames
-  $modules/cloud/amazon/cloudformation.py: jsmartin ryansb tedder
-  $modules/cloud/amazon/cloudformation_facts.py: jmenga
-  $modules/cloud/amazon/cloudfront_facts.py: willthames wilvk
-  $modules/cloud/amazon/cloudtrail.py: $team_ansible shepdelacreme tedder
-  $modules/cloud/amazon/cloudwatchevent_rule.py: jsdalton
-  $modules/cloud/amazon/dynamodb_table.py: loia
-  $modules/cloud/amazon/dynamodb_ttl.py: tedder
-  $modules/cloud/amazon/ec2.py: $team_ansible lwade tgerla
-  $modules/cloud/amazon/ec2_ami.py: Constantin07 gunzy83 scicoin-project willthames
-  $modules/cloud/amazon/ec2_ami_copy.py: amir343
-  $modules/cloud/amazon/ec2_ami_find.py: tombamford
-  $modules/cloud/amazon/ec2_asg.py: $team_ansible garethr s-hertel ryansb
-  $modules/cloud/amazon/ec2_asg_facts.py: wimnat
-  $modules/cloud/amazon/ec2_customer_gateway.py: MichaelBaydoun michaelbaydoun
-  $modules/cloud/amazon/ec2_eip.py: rickmendes
-  $modules/cloud/amazon/ec2_elb.py: jarv
-  $modules/cloud/amazon/ec2_elb_lb.py: jsdalton
-  $modules/cloud/amazon/ec2_eni.py: wimnat
-  $modules/cloud/amazon/ec2_eni_facts.py: wimnat
-  $modules/cloud/amazon/ec2_facts.py: roadmapper silviud
-  $modules/cloud/amazon/ec2_group.py: adq $team_ansible
-  $modules/cloud/amazon/ec2_group_facts.py: Sodki willthames
+  $modules/cloud/amazon/cloudformation.py: ryansb tedder
+  $modules/cloud/amazon/cloudfront_facts.py: willthames
+  $modules/cloud/amazon/cloudtrail.py: $team_ansible
+  $modules/cloud/amazon/ec2.py: $team_ansible
+  $modules/cloud/amazon/ec2_ami.py: willthames
+  $modules/cloud/amazon/ec2_asg.py: $team_ansible s-hertel ryansb
+  $modules/cloud/amazon/ec2_group.py: $team_ansible
+  $modules/cloud/amazon/ec2_group_facts.py: willthames
   $modules/cloud/amazon/ec2_instance_facts.py: willthames
-  $modules/cloud/amazon/ec2_key.py: $team_ansible zbal
-  $modules/cloud/amazon/ec2_lc.py: $team_ansible garethr
-  $modules/cloud/amazon/ec2_lc_facts.py: psykotox willthames
-  $modules/cloud/amazon/ec2_lc_find.py: fiunchinho
-  $modules/cloud/amazon/ec2_metric_alarm.py: $team_ansible zeekin
-  $modules/cloud/amazon/ec2_scaling_policy.py: zeekin
-  $modules/cloud/amazon/ec2_snapshot.py: willthames
-  $modules/cloud/amazon/ec2_snapshot_facts.py: wimnat
-  $modules/cloud/amazon/ec2_tag.py: $team_ansible lwade
-  $modules/cloud/amazon/ec2_vol.py: $team_ansible lwade
-  $modules/cloud/amazon/ec2_vol_facts.py: wimnat
-  $modules/cloud/amazon/ec2_vpc_dhcp_options.py: joelthompson
-  $modules/cloud/amazon/ec2_vpc_dhcp_options_facts.py: naslanidis
-  $modules/cloud/amazon/ec2_vpc_endpoint.py: Etherdaemon willthames
-  $modules/cloud/amazon/ec2_vpc_endpoint_facts.py: Etherdaemon willthames
-  $modules/cloud/amazon/ec2_vpc_igw.py:
-    ignored: erydo
-    maintainers: willthames
-  $modules/cloud/amazon/ec2_vpc_igw_facts.py: naslanidis willthames
-  $modules/cloud/amazon/ec2_vpc_nacl.py: mmochan
-  $modules/cloud/amazon/ec2_vpc_nacl_facts.py: brandond
-  $modules/cloud/amazon/ec2_vpc_nat_gateway.py: Etherdaemon jonhadfield linuxdynasty
-  $modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py: Etherdaemon willthames
-  $modules/cloud/amazon/ec2_vpc_net.py: $team_ansible defionscode
-  $modules/cloud/amazon/ec2_vpc_net_facts.py: whiter wimnat
-  $modules/cloud/amazon/ec2_vpc_peer.py: mmochan
-  $modules/cloud/amazon/ec2_vpc_peering_facts.py: Etherdaemon willthames
-  $modules/cloud/amazon/ec2_vpc_route_table.py:
-    ignored: erydo
-    maintainers: wimnat
-  $modules/cloud/amazon/ec2_vpc_route_table_facts.py: wimnat
-  $modules/cloud/amazon/ec2_vpc_subnet.py:
-    ignored: erydo
-    maintainers: brandond willthames
-  $modules/cloud/amazon/ec2_vpc_subnet_facts.py: wimnat
-  $modules/cloud/amazon/ec2_vpc_vgw.py: naslanidis
-  $modules/cloud/amazon/ec2_vpc_vgw_facts.py: naslanidis
-  $modules/cloud/amazon/ec2_win_password.py: rickmendes
+  $modules/cloud/amazon/ec2_key.py: $team_ansible
+  $modules/cloud/amazon/ec2_lc.py: $team_ansible
+  $modules/cloud/amazon/ec2_lc_facts.py: willthames
+  $modules/cloud/amazon/ec2_metric_alarm.py: $team_ansible
+  $modules/cloud/amazon/ec2_tag.py: $team_ansible
+  $modules/cloud/amazon/ec2_vol.py: $team_ansible
+  $modules/cloud/amazon/ec2_vpc_endpoint.py: willthames
+  $modules/cloud/amazon/ec2_vpc_endpoint_facts.py: willthames
+  $modules/cloud/amazon/ec2_vpc_igw.py: willthames
+  $modules/cloud/amazon/ec2_vpc_igw_facts.py: willthames
+  $modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py: willthames
+  $modules/cloud/amazon/ec2_vpc_net.py: $team_ansible
+  $modules/cloud/amazon/ec2_vpc_net_facts.py: whiter
+  $modules/cloud/amazon/ec2_vpc_peering_facts.py: willthames
+  $modules/cloud/amazon/ec2_vpc_subnet.py: willthames
   $modules/cloud/amazon/ecs_cluster.py: willthames
-  $modules/cloud/amazon/ecs_ecr.py: leedm777 willthames
-  $modules/cloud/amazon/ecs_service.py:
-    ignored: simplesteph
-    maintainers: willthames
-  $modules/cloud/amazon/ecs_service_facts.py: java1guy kaczynskid willthames
+  $modules/cloud/amazon/ecs_ecr.py: willthames
+  $modules/cloud/amazon/ecs_service.py: willthames
+  $modules/cloud/amazon/ecs_service_facts.py: willthames
   $modules/cloud/amazon/ecs_task.py: willthames
   $modules/cloud/amazon/ecs_taskdefinition.py: willthames
   $modules/cloud/amazon/ecs_taskdefinition_facts.py: willthames
-  $modules/cloud/amazon/efs.py: akazakov ryansydnor
-  $modules/cloud/amazon/efs_facts.py: ryansydnor
-  $modules/cloud/amazon/elasticache.py: alachaum jsdalton
-  $modules/cloud/amazon/elasticache_parameter_group.py: s-hertel
-  $modules/cloud/amazon/elasticache_snapshot.py: s-hertel
-  $modules/cloud/amazon/elasticache_subnet_group.py: timmahoney
-  $modules/cloud/amazon/elb_application_lb.py: wimnat
-  $modules/cloud/amazon/elb_target_group.py: wimnat
-  $modules/cloud/amazon/elb_target_group_facts.py: willthames wimnat
-  $modules/cloud/amazon/execute_lambda.py: ryansb
-  $modules/cloud/amazon/iam.py:
-    ignored: seiffert
-    maintainers: $team_ansible defionscode
+  $modules/cloud/amazon/elasticache.py: alachaum
+  $modules/cloud/amazon/elb_target_group_facts.py: willthames
+  $modules/cloud/amazon/iam.py: $team_ansible
   $modules/cloud/amazon/iam_cert.py: $team_ansible
-  $modules/cloud/amazon/iam_cert_facts.py: Lujeni willthames
   $modules/cloud/amazon/iam_group.py: willthames
-  $modules/cloud/amazon/iam_managed_policy.py: dkhenry willthames
-  $modules/cloud/amazon/iam_mfa_device_facts.py: pwnall
-  $modules/cloud/amazon/iam_policy.py: $team_ansible defionscode
-  $modules/cloud/amazon/iam_role.py: wimnat
-  $modules/cloud/amazon/iam_server_certificate_facts.py: linuxdynasty
-  $modules/cloud/amazon/kinesis_stream.py: linuxdynasty
-  $modules/cloud/amazon/lambda.py: steynovich
-  $modules/cloud/amazon/lambda_facts.py: pjodouin
-  $modules/cloud/amazon/lightsail.py: nickball
-  $modules/cloud/amazon/rds_param_group.py: scottanderson42 tastychutney
-  $modules/cloud/amazon/rds_subnet_group.py: scottanderson42 tastychutney
-  $modules/cloud/amazon/redshift.py: j-carl
-  $modules/cloud/amazon/redshift_subnet_group.py: j-carl
-  $modules/cloud/amazon/route53.py: bpennypacker
-  $modules/cloud/amazon/route53_facts.py: Etherdaemon
-  $modules/cloud/amazon/route53_health_check.py: willthames zimbatm
-  $modules/cloud/amazon/route53_zone.py: minichate
-  $modules/cloud/amazon/s3.py: $team_ansible lwade
-  $modules/cloud/amazon/s3_bucket.py: wimnat
-  $modules/cloud/amazon/s3_lifecycle.py: wimnat
-  $modules/cloud/amazon/s3_logging.py: wimnat
-  $modules/cloud/amazon/s3_sync.py: tedder
-  $modules/cloud/amazon/s3_website.py: wimnat
-  $modules/cloud/amazon/sns.py: mjschultz willthames
+  $modules/cloud/amazon/iam_managed_policy.py: willthames
+  $modules/cloud/amazon/iam_policy.py: $team_ansible
+  $modules/cloud/amazon/rds_param_group.py: scottanderson42
+  $modules/cloud/amazon/rds_subnet_group.py: scottanderson42
+  $modules/cloud/amazon/route53_health_check.py: willthames
+  $modules/cloud/amazon/sns.py: willthames
   $modules/cloud/amazon/sns_topic.py: willthames
-  $modules/cloud/amazon/sqs_queue.py: loia nadirollo nand0p
-  $modules/cloud/amazon/sts_assume_role.py: bekelchik
-  $modules/cloud/amazon/sts_session_token.py: pwnall
   $modules/cloud/atomic/: krsacme
-  $modules/cloud/azure/azure.py:
-    ignored: jwhitbeck
+  $modules/cloud/azure/:
+    ignored: chouseknecht jwhitbeck
+    maintainers: $team_azure
   $modules/cloud/azure/azure_rm_dnsrecordset.py:
     ignored: ozboms
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_loadbalancer.py:
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_networkinterface.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_networkinterface_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_publicipaddress.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_publicipaddress_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_resourcegroup.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_resourcegroup_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_securitygroup.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_securitygroup_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_storageaccount.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_storageaccount_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_storageblob.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_subnet.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_virtualmachine.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_virtualmachineimage_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_virtualnetwork.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
-  $modules/cloud/azure/azure_rm_virtualnetwork_facts.py:
-    ignored: chouseknecht
-    maintainers: $team_azure
   $modules/cloud/centurylink/: clc-runner
-  $modules/cloud/cloudscale/cloudscale_server.py: gaudenz
   $modules/cloud/cloudstack/: $team_cloudstack
   $modules/cloud/digital_ocean/: BondAnthony
-  $modules/cloud/digital_ocean/digital_ocean.py: alukovenko zbal
-  $modules/cloud/digital_ocean/digital_ocean_domain.py: alukovenko mgregson
+  $modules/cloud/digital_ocean/digital_ocean.py: alukovenko
+  $modules/cloud/digital_ocean/digital_ocean_domain.py: alukovenko
   $modules/cloud/digital_ocean/digital_ocean_sshkey.py: alukovenko mgregson
-  $modules/cloud/digital_ocean/digital_ocean_tag.py: kontrafiktion
-  $modules/cloud/dimensiondata/dimensiondata_network.py: aimonb tintoy
-  $modules/cloud/docker/docker_container.py:
+  $modules/cloud/dimensiondata/dimensiondata_network.py: tintoy
+  $modules/cloud/docker/:
     ignored: ThomasSteinbach
-    maintainers: $team_ansible cove dusdanig felixfontein kassiansun softzilla zfil
-  $modules/cloud/docker/docker_image.py: $team_ansible softzilla
+  $modules/cloud/docker/docker_container.py: $team_ansible felixfontein
+  $modules/cloud/docker/docker_image.py: $team_ansible
   $modules/cloud/docker/docker_image_facts.py: $team_ansible
-  $modules/cloud/docker/docker_login.py: olsaki
-  $modules/cloud/docker/docker_network.py: keitwb olsaki
-  $modules/cloud/docker/docker_secret.py:
+  $modules/cloud/docker/docker_network.py: olsaki
   $modules/cloud/docker/docker_service.py: $team_ansible
   $modules/cloud/google/:
     maintainers: rambleraptor erjohnso
     ignored: supertom
   $modules/cloud/google/gc_storage.py: supertom
-  $modules/cloud/google/gcdns_record.py: walbert947
-  $modules/cloud/google/gcdns_zone.py: walbert947
-  $modules/cloud/google/gce_eip.py: erjohnso supertom
-  $modules/cloud/google/gce_img.py: supertom
-  $modules/cloud/google/gce_instance_template.py: GwenaelPellenArkeup erjohnso
-  $modules/cloud/google/gce_labels.py: erjohnso
-  $modules/cloud/google/gce_lb.py: erjohnso
-  $modules/cloud/google/gce_mig.py: erjohnso supertom
-  $modules/cloud/google/gce_pd.py: erjohnso
-  $modules/cloud/google/gce_snapshot.py: erjohnso robwagner33
-  $modules/cloud/google/gce_tag.py: supertom
-  $modules/cloud/google/gcp_backend_service.py: erjohnso supertom
-  $modules/cloud/google/gcp_forwarding_rule.py: erjohnso supertom
-  $modules/cloud/google/gcp_healthcheck.py: erjohnso supertom
-  $modules/cloud/google/gcp_target_proxy.py: erjohnso supertom
-  $modules/cloud/google/gcp_url_map.py: erjohnso supertom
-  $modules/cloud/google/gcpubsub.py: erjohnso supertom
-  $modules/cloud/google/gcpubsub_facts.py: erjohnso supertom
-  $modules/cloud/google/gcspanner.py: supertom
-  $modules/cloud/linode/linode.py: intheclouddan rwaweber zbal
-  $modules/cloud/lxc/lxc_container.py: cloudnull
+  $modules/cloud/linode/linode.py: intheclouddan rwaweber
   $modules/cloud/lxd/: hnakamur
   $modules/cloud/memset/: analbeard
-  $modules/cloud/misc/helm.py: flaper87
   $modules/cloud/misc/ovirt.py:
     ignored: vincentvdk
     maintainers: joshainglis karmab machacekondra mwperina
-  $modules/cloud/misc/proxmox.py: UnderGreen
-  $modules/cloud/misc/proxmox_kvm.py: helldorado
-  $modules/cloud/misc/proxmox_template.py: UnderGreen
-  $modules/cloud/misc/rhevm.py: TimothyVandenbrande
-  $modules/cloud/misc/serverless.py: ryansb
   $modules/cloud/misc/virt.py: $team_ansible
-  $modules/cloud/misc/virt_net.py: drybjed
-  $modules/cloud/misc/virt_pool.py: drybjed
   $modules/cloud/misc/xenserver_facts.py:
     ignored: andyhky
-    maintainers: cheese
   $modules/cloud/opennebula/: ilicmilan kustodian
   $modules/cloud/openstack/: $team_openstack
-  $modules/cloud/openstack/os_keystone_service.py: $team_openstack SamYaple
-  $modules/cloud/openstack/os_project.py: $team_openstack agireud
-  $modules/cloud/ovh/ovh_ip_loadbalancing_backend.py: pascalheraud
   $modules/cloud/ovirt/: machacekondra mwperina
-  $modules/cloud/packet/:
   $modules/cloud/profitbricks/: baldwinSPC
-  $modules/cloud/pubnub/pubnub_blocks.py: parfeon pubnub
   $modules/cloud/rackspace/:
     ignored: sivel angstwad
-  $modules/cloud/rackspace/rax_cdb.py: jails
-  $modules/cloud/rackspace/rax_cdb_database.py: jails
-  $modules/cloud/rackspace/rax_cdb_user.py: jails
-  $modules/cloud/rackspace/rax_clb_nodes.py: neuroid
-  $modules/cloud/rackspace/rax_clb_ssl.py: smashwilson
-  $modules/cloud/rackspace/rax_dns.py:
-  $modules/cloud/rackspace/rax_dns_record.py:
-  $modules/cloud/rackspace/rax_facts.py:
-  $modules/cloud/rackspace/rax_files.py:
-  $modules/cloud/rackspace/rax_files_objects.py:
-  $modules/cloud/rackspace/rax_keypair.py:
-  $modules/cloud/rackspace/rax_meta.py:
-  $modules/cloud/rackspace/rax_mon_alarm.py: smashwilson
-  $modules/cloud/rackspace/rax_mon_check.py: smashwilson
-  $modules/cloud/rackspace/rax_mon_entity.py: smashwilson
-  $modules/cloud/rackspace/rax_mon_notification.py: smashwilson
-  $modules/cloud/rackspace/rax_mon_notification_plan.py: smashwilson
-  $modules/cloud/rackspace/rax_scaling_group.py:
-  $modules/cloud/rackspace/rax_scaling_policy.py:
-  $modules/cloud/smartos/imgadm.py: jasperla
-  $modules/cloud/smartos/smartos_image_facts.py: xen0l
-  $modules/cloud/smartos/vmadm.py: jasperla
-  $modules/cloud/softlayer/sl_vm.py: mcltn
   $modules/cloud/univention/: 2-B
   $modules/cloud/vmware/:
     maintainers: $team_vmware
     ignored: jcpowermac mtnbikenc
   $modules/cloud/vmware/vmware_host.py: dagwieers
   $modules/cloud/vmware/vmware_vm_shell.py: chrrrles
-  $modules/cloud/vmware/vsphere_guest.py: dagwieers
+  $modules/cloud/vmware/_vsphere_guest.py: dagwieers
   $modules/cloud/vultr/: $team_vultr
   $modules/cloud/webfaction/: quentinsf
-  $modules/clustering/consul.py: sgargan
-  $modules/clustering/consul_acl.py: sgargan
-  $modules/clustering/consul_kv.py: sgargan
-  $modules/clustering/consul_session.py: sgargan
-  $modules/clustering/etcd3.py: evrardjp
-  $modules/clustering/k8s: chouseknecht maxamillion fabianvf flaper87 willthames
-  $modules/clustering/kubernetes.py: erjohnso supertom
-  $modules/clustering/openshift: chouseknecht maxamillion fabianvf flaper87
-  $modules/clustering/pacemaker_cluster.py:
-  $modules/clustering/znode.py: treyperry
+  $modules/clustering/k8s/: chouseknecht maxamillion fabianvf flaper87 willthames
+  $modules/clustering/k8s/_kubernetes.py: supertom
+  $modules/clustering/openshift/: chouseknecht maxamillion fabianvf flaper87
   $modules/commands/command.py: $team_ansible
-  $modules/commands/expect.py: sivel
   $modules/commands/raw.py: $team_ansible
   $modules/commands/script.py: $team_ansible
   $modules/commands/shell.py: $team_ansible
   $modules/crypto/: Spredzy
   $modules/crypto/acme/: resmo felixfontein
   $modules/database/influxdb/: kamsz
-  $modules/database/misc/elasticsearch_plugin.py: ThePixelDeveloper
-  $modules/database/misc/kibana_plugin.py: barryib
-  $modules/database/misc/redis.py: slok
-  $modules/database/misc/riak.py: drewkerrigan jsmartin
-  $modules/database/mongodb/mongodb_parameter.py: nerzhul
-  $modules/database/mongodb/mongodb_user.py: lujeni
-  $modules/database/mssql/mssql_db.py: Jmainguy vedit kenichi-ogawa-1988
-  $modules/database/mysql/mysql_replication.py: banyek
-  $modules/database/mysql/mysql_user.py: Jmainguy
-  $modules/database/mysql/mysql_variables.py: banyek
-  $modules/database/postgresql/postgresql_db.py: $team_ansible matburt
-  $modules/database/postgresql/postgresql_ext.py: dschep matburt
-  $modules/database/postgresql/postgresql_lang.py: jensdepuydt matburt
-  $modules/database/postgresql/postgresql_privs.py: b6d matburt
-  $modules/database/postgresql/postgresql_schema.py:
-  $modules/database/postgresql/postgresql_user.py: $team_ansible matburt nerzhul
+  $modules/database/mssql/mssql_db.py: Jmainguy kenichi-ogawa-1988
+  $modules/database/postgresql/: matburt
+  $modules/database/postgresql/postgresql_db.py: $team_ansible
+  $modules/database/postgresql/postgresql_user.py: $team_ansible nerzhul
   $modules/database/proxysql/: bmildren
   $modules/database/vertica/: dareko
   $modules/files/acl.py:
     ignored: astorije
-    maintainers: $team_ansible bcoca
-  $modules/files/archive.py: bendoh
-  $modules/files/assemble.py: $team_ansible sfromm
-  $modules/files/blockinfile.py: yaegashi
+    maintainers: $team_ansible
+  $modules/files/assemble.py: $team_ansible
   $modules/files/copy.py: $team_ansible
   $modules/files/fetch.py: $team_ansible
   $modules/files/file.py: $team_ansible
   $modules/files/find.py: $team_ansible
-  $modules/files/lineinfile.py: ahtik $team_ansible dhozac samdoran
-  $modules/files/replace.py: EvanK
-  $modules/files/stat.py: bpennypacker
-  $modules/files/synchronize.py: $team_ansible tima
-  $modules/files/tempfile.py:
+  $modules/files/lineinfile.py: $team_ansible samdoran
+  $modules/files/synchronize.py: $team_ansible
   $modules/files/template.py: $team_ansible
   $modules/files/unarchive.py:
+    ignored: dagwieers
     labels: m:unarchive
     maintainers: pileofrogs
-    ignored: dagwieers
-  $modules/files/xattr.py: $team_ansible bcoca
+  $modules/files/xattr.py: $team_ansible
   $modules/files/xml.py:
     ignored: magnus919
     labels: m:xml
     maintainers: sm4rk0 cmprescott
   $modules/identity/cyberark/:
     notified: cyberark-bizdev
-  $modules/identity/ipa/:
-    maintainers: $team_ipa
+  $modules/identity/ipa/: $team_ipa
   $modules/identity/keycloak/: eikef
-  $modules/identity/opendj/opendj_backendprop.py: dj-wasabi
   $modules/inventory/add_host.py: $team_ansible
-  $modules/inventory/group_by.py: $team_ansible jhoekx
+  $modules/inventory/group_by.py: $team_ansible
   $modules/messaging/rabbitmq_binding.py: $team_rabbitmq
   $modules/messaging/rabbitmq_exchange.py: $team_rabbitmq
   $modules/messaging/rabbitmq_parameter.py: $team_rabbitmq
@@ -393,50 +183,17 @@ files:
   $modules/messaging/rabbitmq_vhost.py:
     ignored: choffman
     maintainers: $team_rabbitmq
-  $modules/monitoring/airbrake_deployment.py: bpennypacker
-  $modules/monitoring/bigpanda.py: hkariti
-  $modules/monitoring/boundary_meter.py: ccollicutt
-  $modules/monitoring/circonus_annotation.py: NickatEpic
   $modules/monitoring/datadog_event.py:
     ignored: arturaz
-    maintainers: n0ts
-  $modules/monitoring/datadog_monitor.py: skornehl
-  $modules/monitoring/honeybadger_deployment.py: stympy
-  $modules/monitoring/icinga2_feature.py: nerzhul
-  $modules/monitoring/librato_annotation.py: sedward
   $modules/monitoring/logentries.py:
     ignored: ivanvanderbyl
-  $modules/monitoring/logicmonitor.py: ethanculler woz5999
-  $modules/monitoring/logstash_plugin.py: nerzhul
-  $modules/monitoring/monit.py: brian-brazil dstoflet
-  $modules/monitoring/nagios.py: tbielawa
-  $modules/monitoring/newrelic_deployment.py: mcodd
-  $modules/monitoring/pagerduty_alert.py:
-  $modules/monitoring/pingdom.py: thaumos
-  $modules/monitoring/rollbar_deployment.py: kavu
-  $modules/monitoring/sensu_check.py: andsens
-  $modules/monitoring/sensu_silence.py: smbambling
-  $modules/monitoring/sensu_subscription.py: andsens
-  $modules/monitoring/stackdriver.py: bwhaley
-  $modules/monitoring/statusio_maintenance.py: bhcopeland
-  $modules/monitoring/uptimerobot.py: nate-kingsley
-  $modules/monitoring/zabbix: eikef D3DeFi
-  $modules/monitoring/zabbix/zabbix_group.py: cove harrisongu
-  $modules/monitoring/zabbix/zabbix_host.py: cove harrisongu
-  $modules/monitoring/zabbix/zabbix_hostmacro.py: cave
-  $modules/monitoring/zabbix/zabbix_maintenance.py: abulimov
-  $modules/monitoring/zabbix/zabbix_screen.py: cove harrisongu
-  $modules/monitoring/zabbix/zabbix_template.py: eikef Logan2211 sookido
-  $modules/net_tools/basics/get_url.py: jpmens ptux
+  $modules/monitoring/monit.py: brian-brazil
+  $modules/monitoring/zabbix/: eikef D3DeFi
+  $modules/net_tools/basics/get_url.py: ptux
   $modules/net_tools/basics/slurp.py: $team_ansible
   $modules/net_tools/basics/uri.py: $team_ansible
   $modules/net_tools/cloudflare_dns.py: andreaso
-  $modules/net_tools/dnsimple.py: drcapulet
-  $modules/net_tools/dnsmadeeasy.py: briceburg
   $modules/net_tools/exoscale/: resmo
-  $modules/net_tools/haproxy.py: ravibhure
-  $modules/net_tools/ipify_facts.py: resmo
-  $modules/net_tools/ipinfoio_facts.py: akostyuk
   $modules/net_tools/ldap/: jtyr
   $modules/net_tools/lldp.py:
     ignored: andyhky
@@ -445,10 +202,6 @@ files:
     labels:
       - networking
       - infoblox
-  $modules/net_tools/nmcli.py: alcamie101
-  $modules/net_tools/nsupdate.py: nerzhul
-  $modules/net_tools/omapi_host.py: nerzhul
-  $modules/net_tools/snmp_facts.py: ogenstad
   $modules/network/a10/: ericchou1 mischapeters
   $modules/network/aci/: $team_aci
   $modules/network/aireos/: jmighion
@@ -482,9 +235,9 @@ files:
   $modules/network/layer2/: $team_networking
   $modules/network/layer3/: $team_networking
   $modules/network/meraki/: $team_meraki
-  $modules/network/netconf/netconf_config.py: lpenz userlerueda $team_networking
-  $modules/network/netconf/netconf_get.py: wisotzky $team_networking
-  $modules/network/netconf/netconf_rpc.py: wisotzky $team_networking
+  $modules/network/netconf/netconf_config.py: userlerueda $team_networking
+  $modules/network/netconf/netconf_get.py: $team_networking
+  $modules/network/netconf/netconf_rpc.py: $team_networking
   $modules/network/netscaler/: $team_netscaler
   $modules/network/netvisor/: $team_netvisor
   $modules/network/nos/: $team_extreme
@@ -509,33 +262,10 @@ files:
   $modules/network/system/: $team_networking
   $modules/network/voss/: $team_extreme
   $modules/network/vyos/: Qalthos samdoran
-  $modules/notification/bearychat.py: tonyseek
-  $modules/notification/campfire.py: fabulops
-  $modules/notification/catapult.py: Jmainguy
-  $modules/notification/cisco_spark.py:
-  $modules/notification/flowdock.py: mcodd
-  $modules/notification/grove.py: zimbatm
-  $modules/notification/hall.py: bkimble
-  $modules/notification/hipchat.py: pb8226 shirou
-  $modules/notification/jabber.py: bcoca
-  $modules/notification/mattermost.py: bjolivot
-  $modules/notification/mqtt.py: jpmens
-  $modules/notification/nexmo.py: sivel
   $modules/notification/osx_say.py: $team_ansible
-  $modules/notification/pushbullet.py: willybarro
-  $modules/notification/pushover.py: weaselkeeper
   $modules/notification/rocketchat.py:
     ignored: ramondelafuente
     maintainers: Deepakkothandan
-  $modules/notification/sendgrid.py: makaimc
-  $modules/notification/slack.py: ramondelafuente
-  $modules/notification/telegram.py: tyouxa
-  $modules/notification/twilio.py: makaimc
-  $modules/notification/typetalk.py: tksmd
-  $modules/packaging/language/bower.py: mwarkentin
-  $modules/packaging/language/bundler.py: thoiberg
-  $modules/packaging/language/cpanm.py:
-  $modules/packaging/language/easy_install.py: mattupstate
   $modules/packaging/language/gem.py: $team_ansible
   $modules/packaging/language/maven_artifact.py:
     ignored: chrisisbeef
@@ -543,56 +273,29 @@ files:
   $modules/packaging/language/npm.py:
     ignored: chrishoffman
     maintainers: shane-walker xcambar
-  $modules/packaging/language/pear.py:
   $modules/packaging/language/pip.py: lujeni robinro
   $modules/packaging/os/apk.py:
     ignored: kbrebanov
     maintainers: tdtrask
-  $modules/packaging/os/apt.py: $team_ansible mgwilliams
-  $modules/packaging/os/apt_key.py: jvantuyl
-  $modules/packaging/os/apt_repository.py: $team_ansible sashka
-  $modules/packaging/os/apt_rpm.py: evgkrsk
-  $modules/packaging/os/dnf.py: DJMuggs berenddeschouwer ignatenkobrain maxamillion
-  $modules/packaging/os/dpkg_selections.py: brian-brazil
-  $modules/packaging/os/homebrew.py: andrew-d danieljaouen indrajitr
-  $modules/packaging/os/homebrew_cask.py: danieljaouen enriclluelles indrajitr
-  $modules/packaging/os/homebrew_tap.py: danieljaouen indrajitr
-  $modules/packaging/os/layman.py: jirutka
-  $modules/packaging/os/macports.py: jcftang
-  $modules/packaging/os/openbsd_pkg.py: eest
-  $modules/packaging/os/opkg.py: skinp
+  $modules/packaging/os/apt.py: $team_ansible
+  $modules/packaging/os/apt_repository.py: $team_ansible
   $modules/packaging/os/package.py: $team_ansible
   $modules/packaging/os/pacman.py:
     ignored: elasticdog
-    maintainers: indrajitr
-  $modules/packaging/os/pkg5.py: mavit
-  $modules/packaging/os/pkg5_publisher.py: mavit
-  $modules/packaging/os/pkgin.py: L2G jasperla szinck troy2914
+  $modules/packaging/os/pkgin.py: troy2914
   $modules/packaging/os/pkgng.py:
     ignored: bleader
     maintainers: JoergFiedler
-  $modules/packaging/os/pkgutil.py: dermute scathatheworm
+  $modules/packaging/os/pkgutil.py: scathatheworm
   $modules/packaging/os/portage.py:
     ignored: sayap
-    maintainers: wltjr
-  $modules/packaging/os/portinstall.py: berenddeboer
-  $modules/packaging/os/pulp_repo.py: sysadmind
   $modules/packaging/os/redhat_subscription.py: alikins kahowell
-  $modules/packaging/os/rhn_channel.py: alikins vincentvdk
+  $modules/packaging/os/rhn_channel.py: alikins
   $modules/packaging/os/rhn_register.py: $team_rhn
-  $modules/packaging/os/rpm_key.py: hacosta
-  $modules/packaging/os/slackpkg.py: KimNorgaard
-  $modules/packaging/os/sorcery.py: vaygr
-  $modules/packaging/os/svr4pkg.py: brontitall
-  $modules/packaging/os/swdepot.py: melodous
-  $modules/packaging/os/swupd.py: albertomurillo
-  $modules/packaging/os/urpmi.py: pmakowski
-  $modules/packaging/os/yum.py: $team_ansible berenddeschouwer verm666 kustodian maxamillion
-  $modules/packaging/os/yum_repository.py: jtyr
+  $modules/packaging/os/yum.py: $team_ansible kustodian
   $modules/packaging/os/zypper.py:
     ignored: dirtyharrycallahan
-    maintainers: AnderEnder alxgu andytom robinro
-  $modules/packaging/os/zypper_repository.py: matze robinro
+  $modules/packaging/os/zypper_repository.py: robinro
   $modules/remote_management/foreman/: ehelms
   $modules/remote_management/hpilo/: dagwieers haad
   $modules/remote_management/imc/: dagwieers
@@ -600,118 +303,56 @@ files:
   $modules/remote_management/manageiq/: $team_manageiq
   $modules/remote_management/stacki/stacki_host.py: bbyhuy bsanders
   $modules/remote_management/ucs/: $team_ucs
-  $modules/source_control/bzr.py: andreparames
   $modules/source_control/git.py: $team_ansible
-  $modules/source_control/git_config.py: djmattyg007
-  $modules/source_control/github_deploy_key.py: bincyber
-  $modules/source_control/github_hooks.py: pcgentry
-  $modules/source_control/github_issue.py: Akasurde
   $modules/source_control/github_key.py:
     ignored: erydo
-  $modules/source_control/github_release.py: adrianmoisey
-  $modules/source_control/gitlab_group.py: dj-wasabi
-  $modules/source_control/gitlab_project.py: dj-wasabi
-  $modules/source_control/gitlab_user.py: dj-wasabi
-  $modules/source_control/hg.py: yeukhon
-  $modules/source_control/subversion.py: dsummersl
-  $modules/storage/glusterfs/gluster_volume.py: rosmo
-  $modules/storage/glusterfs/gluster_peer.py: sac
   $modules/storage/infinidat/: GR360RY vmalloc
   $modules/storage/netapp/: $team_netapp
   $modules/storage/purestorage/: sdodsley
-  $modules/storage/zfs/zfs.py: johanwiren
-  $modules/storage/zfs/zfs_facts.py: xen0l
-  $modules/storage/zfs/zpool_facts.py: xen0l
-  $modules/system/aix_inittab.py: molekuul
-  $modules/system/aix_lvol.py: adejoux
-  $modules/system/alternatives.py: DavidWittman mulby
   $modules/system/at.py: $team_ansible
   $modules/system/authorized_key.py: $team_ansible
-  $modules/system/awall.py: tdtrask
-  $modules/system/beadm.py: xen0l
-  $modules/system/capabilities.py: natefoo
-  $modules/system/cron.py: EvanK dsummersl lberruti
-  $modules/system/cronvar.py: dougluce
-  $modules/system/crypttab.py: groks
-  $modules/system/dconf.py: azaghal
-  $modules/system/debconf.py: bcoca
   $modules/system/facter.py: $team_ansible
-  $modules/system/filesystem.py: abulimov pilou-
-  $modules/system/firewalld.py: maxamillion
-  $modules/system/gconftool2.py: Akasurde kevensen
-  $modules/system/getent.py: bcoca
-  $modules/system/group.py: $team_ansible sfromm
-  $modules/system/interfaces_file.py: hryamzik obourdon
-  $modules/system/iptables.py: LinusU
-  $modules/system/java_cert.py:
-  $modules/system/kernel_blacklist.py: matze
-  $modules/system/known_hosts.py: mcv21
-  $modules/system/locale_gen.py: AugustusKling
-  $modules/system/lvg.py: abulimov
-  $modules/system/lvol.py: abulimov jhoekx
-  $modules/system/make.py: LinusU
+  $modules/system/filesystem.py: pilou-
+  $modules/system/gconftool2.py: Akasurde
+  $modules/system/group.py: $team_ansible
+  $modules/system/interfaces_file.py: obourdon
   $modules/system/modprobe.py:
     ignored: stygstra
   $modules/system/mount.py: $team_ansible jtyr
   $modules/system/ohai.py: $team_ansible
-  $modules/system/open_iscsi.py: srvg
-  $modules/system/openwrt_init.py: agaffney
   $modules/system/osx_defaults.py:
     ignored: frenck
     maintainers: $team_ansible
   $modules/system/pam_limits.py:
     ignored: usawa
     maintainers: giovannisciortino
-  $modules/system/pamd.py: kevensen
-  $modules/system/parted.py: ColOfAbRiX
   $modules/system/ping.py: $team_ansible
-  $modules/system/puppet.py: emonty nibalizer
-  $modules/system/runit.py: jsumners
-  $modules/system/seboolean.py: $team_ansible sfromm
-  $modules/system/selinux.py: goozbach samdoran
-  $modules/system/selinux_permissive.py: mscherer
-  $modules/system/seport.py: dankeder
+  $modules/system/puppet.py: nibalizer
+  $modules/system/seboolean.py: $team_ansible
+  $modules/system/selinux.py: samdoran
   $modules/system/service.py: $team_ansible
   $modules/system/setup.py:
     ignored: david_obrien
     maintainers: $team_ansible
-  $modules/system/solaris_zone.py: pmarkham
-  $modules/system/svc.py: bcoca
-  $modules/system/sysctl.py: Akasurde davixx
+  $modules/system/sysctl.py: Akasurde
   $modules/system/systemd.py: $team_ansible
-  $modules/system/timezone.py: jasperla tmshn
-  $modules/system/ufw.py: ahtik ovcharenko pyykkis
-  $modules/system/user.py: $team_ansible sfromm samdoran
+  $modules/system/user.py: $team_ansible samdoran
   $modules/utilities/helper/meta.py: $team_ansible
   $modules/utilities/logic/assert.py: $team_ansible
   $modules/utilities/logic/async_status.py: $team_ansible
   $modules/utilities/logic/async_wrapper.py: $team_ansible
   $modules/utilities/logic/include.py: $team_ansible
   $modules/utilities/logic/include_role.py: $team_ansible
-  $modules/utilities/logic/include_vars.py: $team_ansible linuxdynasty
-  $modules/utilities/logic/pause.py: tbielawa samdoran
-  $modules/utilities/logic/set_stats.py: bcoca
-  $modules/utilities/logic/wait_for.py: AnderEnder gregswift jarv jhoekx
+  $modules/utilities/logic/include_vars.py: $team_ansible
+  $modules/utilities/logic/pause.py: samdoran
+  $modules/utilities/logic/wait_for.py: gregswift
   $modules/web_infrastructure/ansible_tower/: $team_tower
-  $modules/web_infrastructure/apache2_mod_proxy.py: oboukili
-  $modules/web_infrastructure/deploy_helper.py: ramondelafuente
-  $modules/web_infrastructure/django_manage.py: scottanderson42 tastychutney
-  $modules/web_infrastructure/ejabberd_user.py: privateip
-  $modules/web_infrastructure/gunicorn.py: agmezr
+  $modules/web_infrastructure/django_manage.py: scottanderson42
   $modules/web_infrastructure/htpasswd.py: $team_ansible
   $modules/web_infrastructure/jboss.py:
     labels: jboss
-    maintainers: jhoekx
   $modules/web_infrastructure/jboss/: $team_jboss
-  $modules/web_infrastructure/jenkins_job.py: sermilrod
-  $modules/web_infrastructure/jenkins_plugin.py: jtyr
-  $modules/web_infrastructure/jenkins_script.py: hogarthj
-  $modules/web_infrastructure/jira.py: Slezhuk tarka
-  $modules/web_infrastructure/nginx_status_facts.py: resmo
-  $modules/web_infrastructure/rundeck_acl_policy.py:
-  $modules/web_infrastructure/rundeck_project.py: nerzhul
-  $modules/web_infrastructure/supervisorctl.py: inetfuture mattupstate
-  $modules/web_infrastructure/taiga_issue.py: lekum
+  $modules/web_infrastructure/jira.py: Slezhuk
   $modules/windows/:
     maintainers: $team_windows
     ignored: angstwad georgefrank h0nIg
diff --git a/lib/ansible/modules/cloud/amazon/aws_kms.py b/lib/ansible/modules/cloud/amazon/aws_kms.py
index d51e6eacc9..7d89d07a6f 100644
--- a/lib/ansible/modules/cloud/amazon/aws_kms.py
+++ b/lib/ansible/modules/cloud/amazon/aws_kms.py
@@ -61,7 +61,7 @@ options:
     type: bool
     default: true
 
-author: tedder
+author: Ted Timmons (@tedder)
 extends_documentation_fragment:
 - aws
 - ec2
diff --git a/lib/ansible/modules/cloud/amazon/cloudtrail.py b/lib/ansible/modules/cloud/amazon/cloudtrail.py
index 941233d6df..8b1d06743c 100644
--- a/lib/ansible/modules/cloud/amazon/cloudtrail.py
+++ b/lib/ansible/modules/cloud/amazon/cloudtrail.py
@@ -19,9 +19,9 @@ description:
   - Creates, deletes, or updates CloudTrail configuration. Ensures logging is also enabled.
 version_added: "2.0"
 author:
-    - "Ansible Core Team"
-    - "Ted Timmons"
-    - "Daniel Shepherd (@shepdelacreme)"
+    - Ansible Core Team
+    - Ted Timmons (@tedder)
+    - Daniel Shepherd (@shepdelacreme)
 requirements:
   - boto3
   - botocore
diff --git a/lib/ansible/modules/cloud/amazon/dynamodb_ttl.py b/lib/ansible/modules/cloud/amazon/dynamodb_ttl.py
index 753ddff361..18eb49e4c9 100644
--- a/lib/ansible/modules/cloud/amazon/dynamodb_ttl.py
+++ b/lib/ansible/modules/cloud/amazon/dynamodb_ttl.py
@@ -35,7 +35,7 @@ options:
     - this appears to be required by the API even when disabling TTL.
     required: true
 
-author: "Ted (@tedder)"
+author: Ted Timmons (@tedder)
 extends_documentation_fragment:
 - aws
 - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_ami_copy.py b/lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
index 00a6023dc6..f630faabe6 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
@@ -71,7 +71,9 @@ options:
         in an existing AMI, the AMI will not be copied again.
     default: false
     version_added: 2.6
-author: "Amir Moulavi <amir.moulavi@gmail.com>, Tim C <defunct@defunct.io>"
+author:
+- Amir Moulavi (@amir343) <amir.moulavi@gmail.com>
+- Tim C <defunct@defunct.io>
 extends_documentation_fragment:
     - aws
     - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_group_facts.py b/lib/ansible/modules/cloud/amazon/ec2_group_facts.py
index d036ce548f..da5ced3cf8 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_group_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_group_facts.py
@@ -19,7 +19,8 @@ description:
     - Gather facts about ec2 security groups in AWS.
 version_added: "2.3"
 requirements: [ boto3 ]
-author: "Henrique Rodrigues (github.com/Sodki)"
+author:
+- Henrique Rodrigues (@Sodki)
 options:
   filters:
     description:
diff --git a/lib/ansible/modules/cloud/amazon/ec2_instance_facts.py b/lib/ansible/modules/cloud/amazon/ec2_instance_facts.py
index ccfca15e99..78513dd99f 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_instance_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_instance_facts.py
@@ -18,8 +18,8 @@ description:
     - Gather facts about ec2 instances in AWS
 version_added: "2.4"
 author:
-  - Michael Schuett, @michaeljs1990
-  - Rob White, @wimnat
+  - Michael Schuett (@michaeljs1990)
+  - Rob White (@wimnat)
 requirements: [ "boto3", "botocore" ]
 options:
   instance_ids:
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
index cd0f01746b..4193c618a3 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
@@ -84,7 +84,7 @@ options:
     description:
       - Optional client token to ensure idempotency
     required: false
-author: Karen Cheng(@Etherdaemon)
+author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
   - aws
   - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint_facts.py
index 02b2439bfd..faadd59dbf 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint_facts.py
@@ -34,7 +34,7 @@ options:
       - A dict of filters to apply. Each dict item consists of a filter key and a filter value.
         See U(http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcEndpoints.html)
         for possible filters.
-author: Karen Cheng(@Etherdaemon)
+author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
     - aws
     - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py
index 6e233721d1..1fb1dfb087 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py
@@ -72,7 +72,7 @@ options:
     required: false
     choices: ['present', 'absent']
     default: present
-author: Mike Mochan(@mmochan)
+author: Mike Mochan (@mmochan)
 extends_documentation_fragment:
     - aws
     - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py
index 139fe86df0..491b1ffc01 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py
@@ -67,9 +67,9 @@ options:
         When specifying this option, ensure you specify the eip_address parameter
         as well otherwise any subsequent runs will fail.
 author:
-  - "Allen Sanabria (@linuxdynasty)"
-  - "Jon Hadfield (@jonhadfield)"
-  - "Karen Cheng(@Etherdaemon)"
+  - Allen Sanabria (@linuxdynasty)
+  - Jon Hadfield (@jonhadfield)
+  - Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
   - aws
   - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py
index 8749d2c668..74c5164081 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway_facts.py
@@ -27,7 +27,7 @@ options:
       - A dict of filters to apply. Each dict item consists of a filter key and a filter value.
         See U(http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeNatGateways.html)
         for possible filters.
-author: Karen Cheng(@Etherdaemon)
+author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
   - aws
   - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py
index 8b6659cfc0..c512e7db0d 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py
@@ -50,7 +50,7 @@ options:
     required: false
     default: present
     choices: ['present', 'absent', 'accept', 'reject']
-author: Mike Mochan(@mmochan)
+author: Mike Mochan (@mmochan)
 extends_documentation_fragment:
     - aws
     - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_peering_facts.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_peering_facts.py
index 6cb430bbc7..85eb217fcd 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_peering_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_peering_facts.py
@@ -26,7 +26,7 @@ options:
       - A dict of filters to apply. Each dict item consists of a filter key and a filter value.
         See U(http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeVpcPeeringConnections.html)
         for possible filters.
-author: Karen Cheng(@Etherdaemon)
+author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
   - aws
   - ec2
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py
index 19a4a50ded..2c5e0d4ebf 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py
@@ -18,7 +18,9 @@ short_description: Manage subnets in AWS virtual private clouds
 description:
     - Manage subnets in AWS virtual private clouds
 version_added: "2.0"
-author: Robert Estelle (@erydo), Brad Davidson (@brandond)
+author:
+- Robert Estelle (@erydo)
+- Brad Davidson (@brandond)
 requirements: [ boto3 ]
 options:
   az:
diff --git a/lib/ansible/modules/cloud/amazon/ecs_cluster.py b/lib/ansible/modules/cloud/amazon/ecs_cluster.py
index eedd9892d8..9681178f58 100644
--- a/lib/ansible/modules/cloud/amazon/ecs_cluster.py
+++ b/lib/ansible/modules/cloud/amazon/ecs_cluster.py
@@ -21,7 +21,7 @@ notes:
 description:
     - Creates or terminates ecs clusters.
 version_added: "2.0"
-author: Mark Chance(@Java1Guy)
+author: Mark Chance (@Java1Guy)
 requirements: [ boto3 ]
 options:
     state:
diff --git a/lib/ansible/modules/cloud/amazon/ecs_task.py b/lib/ansible/modules/cloud/amazon/ecs_task.py
index 9446b81e23..cb212a4301 100644
--- a/lib/ansible/modules/cloud/amazon/ecs_task.py
+++ b/lib/ansible/modules/cloud/amazon/ecs_task.py
@@ -18,7 +18,7 @@ short_description: run, start or stop a task in ecs
 description:
     - Creates or deletes instances of task definitions.
 version_added: "2.0"
-author: Mark Chance(@Java1Guy)
+author: Mark Chance (@Java1Guy)
 requirements: [ json, botocore, boto3 ]
 options:
     operation:
diff --git a/lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py b/lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
index 4a150634f9..e98c016742 100644
--- a/lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
+++ b/lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
@@ -26,7 +26,7 @@ short_description: register a task definition in ecs
 description:
     - Registers or deregisters task definitions in the Amazon Web Services (AWS) EC2 Container Service (ECS)
 version_added: "2.0"
-author: Mark Chance(@Java1Guy)
+author: Mark Chance (@Java1Guy)
 requirements: [ json, botocore, boto3 ]
 options:
     state:
diff --git a/lib/ansible/modules/cloud/amazon/ecs_taskdefinition_facts.py b/lib/ansible/modules/cloud/amazon/ecs_taskdefinition_facts.py
index e7b2e249b6..6aaf68bdbd 100644
--- a/lib/ansible/modules/cloud/amazon/ecs_taskdefinition_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ecs_taskdefinition_facts.py
@@ -21,8 +21,8 @@ description:
     - Describes a task definition in ecs.
 version_added: "2.5"
 author:
-    - Gustavo Maia(@gurumaia)
-    - Mark Chance(@Java1Guy)
+    - Gustavo Maia (@gurumaia)
+    - Mark Chance (@Java1Guy)
     - Darek Kaczynski (@kaczynskid)
 requirements: [ json, botocore, boto3 ]
 options:
diff --git a/lib/ansible/modules/cloud/amazon/iam_group.py b/lib/ansible/modules/cloud/amazon/iam_group.py
index 70eaa45edb..ab8ffe5f14 100644
--- a/lib/ansible/modules/cloud/amazon/iam_group.py
+++ b/lib/ansible/modules/cloud/amazon/iam_group.py
@@ -25,7 +25,9 @@ short_description: Manage AWS IAM groups
 description:
   - Manage AWS IAM groups
 version_added: "2.4"
-author: Nick Aslanidis, @naslanidis, Maksym Postument, @infectsoldier
+author:
+- Nick Aslanidis (@naslanidis)
+- Maksym Postument (@infectsoldier)
 options:
   name:
     description:
diff --git a/lib/ansible/modules/cloud/amazon/route53_facts.py b/lib/ansible/modules/cloud/amazon/route53_facts.py
index 594d1aa4bb..58a87a919f 100644
--- a/lib/ansible/modules/cloud/amazon/route53_facts.py
+++ b/lib/ansible/modules/cloud/amazon/route53_facts.py
@@ -110,7 +110,7 @@ options:
         'tags',
         ]
     default: 'list'
-author: Karen Cheng(@Etherdaemon)
+author: Karen Cheng (@Etherdaemon)
 extends_documentation_fragment:
   - aws
   - ec2
diff --git a/lib/ansible/modules/cloud/amazon/s3_sync.py b/lib/ansible/modules/cloud/amazon/s3_sync.py
index 4f48dd9d4f..3b0d817cd6 100644
--- a/lib/ansible/modules/cloud/amazon/s3_sync.py
+++ b/lib/ansible/modules/cloud/amazon/s3_sync.py
@@ -101,7 +101,7 @@ requirements:
   - botocore
   - python-dateutil
 
-author: tedder
+author: Ted Timmons (@tedder)
 extends_documentation_fragment:
 - aws
 - ec2
diff --git a/lib/ansible/modules/cloud/docker/docker_login.py b/lib/ansible/modules/cloud/docker/docker_login.py
index cadb2459d9..4181df8ee2 100644
--- a/lib/ansible/modules/cloud/docker/docker_login.py
+++ b/lib/ansible/modules/cloud/docker/docker_login.py
@@ -86,8 +86,8 @@ requirements:
     - "Docker API >= 1.20"
     - 'Only to be able to logout (state=absent): the docker command line utility'
 author:
-    - "Olaf Kilian <olaf.kilian@symanex.com>"
-    - "Chris Houseknecht (@chouseknecht)"
+    - Olaf Kilian (@olsaki) <olaf.kilian@symanex.com>
+    - Chris Houseknecht (@chouseknecht)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/cloud/google/gc_storage.py b/lib/ansible/modules/cloud/google/gc_storage.py
index d2ec48fe0b..4371ff4ede 100644
--- a/lib/ansible/modules/cloud/google/gc_storage.py
+++ b/lib/ansible/modules/cloud/google/gc_storage.py
@@ -86,7 +86,9 @@ requirements:
     - "python >= 2.6"
     - "boto >= 2.9"
 
-author: "Benno Joy (@bennojoy), extended by Lukas Beumer (@nitaco)"
+author:
+- Benno Joy (@bennojoy)
+- Lukas Beumer (@nitaco)
 
 '''
 
diff --git a/lib/ansible/modules/cloud/misc/proxmox.py b/lib/ansible/modules/cloud/misc/proxmox.py
index 4bb30b8266..6bd6ed2678 100644
--- a/lib/ansible/modules/cloud/misc/proxmox.py
+++ b/lib/ansible/modules/cloud/misc/proxmox.py
@@ -145,7 +145,7 @@ options:
 notes:
   - Requires proxmoxer and requests modules on host. This modules can be installed with pip.
 requirements: [ "proxmoxer", "python >= 2.7", "requests" ]
-author: "Sergei Antipov @UnderGreen"
+author: Sergei Antipov (@UnderGreen)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/cloud/misc/proxmox_template.py b/lib/ansible/modules/cloud/misc/proxmox_template.py
index d9c002028d..2de04edd25 100644
--- a/lib/ansible/modules/cloud/misc/proxmox_template.py
+++ b/lib/ansible/modules/cloud/misc/proxmox_template.py
@@ -78,7 +78,7 @@ options:
 notes:
   - Requires proxmoxer and requests modules on host. This modules can be installed with pip.
 requirements: [ "proxmoxer", "requests" ]
-author: "Sergei Antipov @UnderGreen"
+author: Sergei Antipov (@UnderGreen)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/cloud/misc/rhevm.py b/lib/ansible/modules/cloud/misc/rhevm.py
index 88705409a9..284f6d6c93 100644
--- a/lib/ansible/modules/cloud/misc/rhevm.py
+++ b/lib/ansible/modules/cloud/misc/rhevm.py
@@ -15,7 +15,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 DOCUMENTATION = '''
 ---
 module: rhevm
-author: Timothy Vandenbrande
+author: Timothy Vandenbrande (@TimothyVandenbrande)
 short_description: RHEV/oVirt automation
 description:
     - This module only supports oVirt/RHEV version 3. A newer module M(ovirt_vms) supports oVirt/RHV version 4.
diff --git a/lib/ansible/modules/cloud/misc/serverless.py b/lib/ansible/modules/cloud/misc/serverless.py
index 6ebebf66df..2cb5b6bbc5 100644
--- a/lib/ansible/modules/cloud/misc/serverless.py
+++ b/lib/ansible/modules/cloud/misc/serverless.py
@@ -71,7 +71,7 @@ options:
 notes:
    - Currently, the `serverless` command must be in the path of the node executing the task. In the future this may be a flag.
 requirements: [ "serverless", "yaml" ]
-author: "Ryan Scott Brown @ryansb"
+author: Ryan Scott Brown (@ryansb)
 '''
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py b/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py
index b5321ca711..34e71cb574 100644
--- a/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py
+++ b/lib/ansible/modules/cloud/ovh/ovh_ip_loadbalancing_backend.py
@@ -19,7 +19,7 @@ short_description: Manage OVH IP LoadBalancing backends
 description:
     - Manage OVH (French European hosting provider) LoadBalancing IP backends
 version_added: "2.2"
-author: Pascal HERAUD @pascalheraud
+author: Pascal Heraud (@pascalheraud)
 notes:
     - Uses the python OVH Api U(https://github.com/ovh/python-ovh).
       You have to create an application (a key and secret) with a consummer
diff --git a/lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py b/lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py
index 92a5188a33..c64a152512 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py
@@ -66,7 +66,7 @@ options:
     description:
     - How long before "wait" gives up, in seconds.
     default: 300
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment:
   - rackspace
   - rackspace.openstack
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py b/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
index 423419b09d..0c16ec8923 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
@@ -65,7 +65,7 @@ options:
     description:
     - Arbitrary key/value pairs to accompany the alarm. Must be a hash of String
       keys and values between 1 and 255 characters long.
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment: rackspace.openstack
 '''
 
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_check.py b/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
index 89ee2896ba..0a04dcf7d0 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
@@ -101,7 +101,7 @@ options:
     description:
     - The number of seconds this check will wait when attempting to collect
       results. Must be less than the period.
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment: rackspace.openstack
 '''
 
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_entity.py b/lib/ansible/modules/cloud/rackspace/rax_mon_entity.py
index 21d917c301..32d3dcb29c 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_entity.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_entity.py
@@ -47,7 +47,7 @@ options:
     - Hash of arbitrary C(name), C(value) pairs that are passed to associated
       rax_mon_alarms. Names and values must all be between 1 and 255 characters
       long.
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment: rackspace.openstack
 '''
 
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_notification.py b/lib/ansible/modules/cloud/rackspace/rax_mon_notification.py
index 6aee351b96..4556d762e2 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_notification.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_notification.py
@@ -43,7 +43,7 @@ options:
       http://docs.rackspace.com/cm/api/v1.0/cm-devguide/content/
       service-notification-types-crud.html for details.
     required: true
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment: rackspace.openstack
 '''
 
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py b/lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py
index 486599bcbd..ef463f433a 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_notification_plan.py
@@ -45,7 +45,7 @@ options:
     description:
     - Notification list to use when the alarm state is OK. Must be an array of
       valid rax_mon_notification ids.
-author: Ash Wilson
+author: Ash Wilson (@smashwilson)
 extends_documentation_fragment: rackspace.openstack
 '''
 
diff --git a/lib/ansible/modules/database/mssql/mssql_db.py b/lib/ansible/modules/database/mssql/mssql_db.py
index 20dd46fd91..65f5167f51 100644
--- a/lib/ansible/modules/database/mssql/mssql_db.py
+++ b/lib/ansible/modules/database/mssql/mssql_db.py
@@ -61,7 +61,7 @@ notes:
 requirements:
    - python >= 2.7
    - pymssql
-author: Vedit Firat Arig
+author: Vedit Firat Arig (@vedit)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/identity/opendj/opendj_backendprop.py b/lib/ansible/modules/identity/opendj/opendj_backendprop.py
index 38ae60d7eb..012ff4a979 100644
--- a/lib/ansible/modules/identity/opendj/opendj_backendprop.py
+++ b/lib/ansible/modules/identity/opendj/opendj_backendprop.py
@@ -21,7 +21,7 @@ description:
    - It will check first via de get-backend-prop if configuration needs to be applied.
 version_added: "2.2"
 author:
-    - Werner Dijkerman
+    - Werner Dijkerman (@dj-wasabi)
 options:
     opendj_bindir:
         description:
diff --git a/lib/ansible/modules/monitoring/logicmonitor.py b/lib/ansible/modules/monitoring/logicmonitor.py
index 3047847b65..eccb5fea1e 100644
--- a/lib/ansible/modules/monitoring/logicmonitor.py
+++ b/lib/ansible/modules/monitoring/logicmonitor.py
@@ -32,7 +32,9 @@ description:
   - LogicMonitor is a hosted, full-stack, infrastructure monitoring platform.
   - This module manages hosts, host groups, and collectors within your LogicMonitor account.
 version_added: "2.2"
-author: [Ethan Culler-Mayeno (@ethanculler), Jeff Wozniak (@woz5999)]
+author:
+- Ethan Culler-Mayeno (@ethanculler)
+- Jeff Wozniak (@woz5999)
 notes:
   - You must have an existing LogicMonitor account for this module to function.
 requirements: ["An existing LogicMonitor account", "Linux"]
diff --git a/lib/ansible/modules/monitoring/sensu_silence.py b/lib/ansible/modules/monitoring/sensu_silence.py
index ccabb68f7f..f957cdf78d 100644
--- a/lib/ansible/modules/monitoring/sensu_silence.py
+++ b/lib/ansible/modules/monitoring/sensu_silence.py
@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: sensu_silence
 version_added: "2.4"
-author: Steven Bambling(@smbambling)
+author: Steven Bambling (@smbambling)
 short_description: Manage Sensu silence entries
 description:
   - Create and clear (delete) a silence entries via the Sensu API
diff --git a/lib/ansible/modules/monitoring/sensu_subscription.py b/lib/ansible/modules/monitoring/sensu_subscription.py
index 81bc48904a..fd1bd4b422 100644
--- a/lib/ansible/modules/monitoring/sensu_subscription.py
+++ b/lib/ansible/modules/monitoring/sensu_subscription.py
@@ -44,7 +44,7 @@ options:
     required: false
     default: no
 requirements: [ ]
-author: Anders Ingemann
+author: Anders Ingemann (@andsens)
 '''
 
 RETURN = '''
diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_host.py b/lib/ansible/modules/monitoring/zabbix/zabbix_host.py
index e93092b03f..a4d6258b9f 100644
--- a/lib/ansible/modules/monitoring/zabbix/zabbix_host.py
+++ b/lib/ansible/modules/monitoring/zabbix/zabbix_host.py
@@ -22,10 +22,10 @@ description:
 version_added: "2.0"
 author:
     - "(@cove)"
-    - "Tony Minfei Ding"
-    - "Harrison Gu (@harrisongu)"
-    - "Werner Dijkerman"
-    - "Eike Frost (@eikef)"
+    - Tony Minfei Ding
+    - Harrison Gu (@harrisongu)
+    - Werner Dijkerman (@dj-wasabi)
+    - Eike Frost (@eikef)
 requirements:
     - "python >= 2.6"
     - "zabbix-api >= 0.5.3"
diff --git a/lib/ansible/modules/notification/hipchat.py b/lib/ansible/modules/notification/hipchat.py
index 84090b9dd9..183270a13b 100644
--- a/lib/ansible/modules/notification/hipchat.py
+++ b/lib/ansible/modules/notification/hipchat.py
@@ -67,7 +67,9 @@ options:
     default: 'https://api.hipchat.com/v1'
     version_added: 1.6.0
 
-author: "WAKAYAMA Shirou (@shirou), BOURDEL Paul (@pb8226)"
+author:
+- Shirou Wakayama (@shirou)
+- Paul Bourdel (@pb8226)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/packaging/os/dnf.py b/lib/ansible/modules/packaging/os/dnf.py
index 5b9bcf07e8..cb09b0e79f 100644
--- a/lib/ansible/modules/packaging/os/dnf.py
+++ b/lib/ansible/modules/packaging/os/dnf.py
@@ -185,10 +185,10 @@ requirements:
   - python-dnf
   - for the autoremove option you need dnf >= 2.0.1"
 author:
-  - '"Igor Gnatenko (@ignatenkobrain)" <i.gnatenko.brain@gmail.com>'
-  - '"Cristian van Ee (@DJMuggs)" <cristian at cvee.org>'
-  - "Berend De Schouwer (github.com/berenddeschouwer)"
-  - '"Adam Miller (@maxamillion)" <admiller@redhat.com>"'
+  - Igor Gnatenko (@ignatenkobrain) <i.gnatenko.brain@gmail.com>
+  - Cristian van Ee (@DJMuggs) <cristian at cvee.org>
+  - Berend De Schouwer (@berenddeschouwer)
+  - Adam Miller (@maxamillion) <admiller@redhat.com>
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/packaging/os/dpkg_selections.py b/lib/ansible/modules/packaging/os/dpkg_selections.py
index a4a91a2795..2e9667e079 100644
--- a/lib/ansible/modules/packaging/os/dpkg_selections.py
+++ b/lib/ansible/modules/packaging/os/dpkg_selections.py
@@ -20,7 +20,8 @@ short_description: Dpkg package selection selections
 description:
     - Change dpkg package selection state via --get-selections and --set-selections.
 version_added: "2.0"
-author: Brian Brazil <brian.brazil@boxever.com>
+author:
+- Brian Brazil (@brian-brazil) <brian.brazil@boxever.com>
 options:
     name:
         description:
diff --git a/lib/ansible/modules/source_control/git_config.py b/lib/ansible/modules/source_control/git_config.py
index cd49e16da3..5e36da98ba 100644
--- a/lib/ansible/modules/source_control/git_config.py
+++ b/lib/ansible/modules/source_control/git_config.py
@@ -19,8 +19,8 @@ DOCUMENTATION = '''
 ---
 module: git_config
 author:
-  - "Matthew Gamble"
-  - "Marius Gedminas"
+  - Matthew Gamble (@djmattyg007)
+  - Marius Gedminas
 version_added: 2.1
 requirements: ['git']
 short_description: Read and write git configuration
diff --git a/lib/ansible/modules/system/selinux_permissive.py b/lib/ansible/modules/system/selinux_permissive.py
index 69fa5c6ab0..d93c281fd1 100644
--- a/lib/ansible/modules/system/selinux_permissive.py
+++ b/lib/ansible/modules/system/selinux_permissive.py
@@ -44,7 +44,7 @@ options:
 notes:
     - Requires a version of SELinux recent enough ( ie EL 6 or newer )
 requirements: [ policycoreutils-python ]
-author: Michael Scherer <misc@zarb.org>
+author: Michael Scherer (@mscherer) <misc@zarb.org>
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/system/seport.py b/lib/ansible/modules/system/seport.py
index a9d88e6443..0ff4efb74d 100644
--- a/lib/ansible/modules/system/seport.py
+++ b/lib/ansible/modules/system/seport.py
@@ -49,7 +49,7 @@ requirements:
 - libselinux-python
 - policycoreutils-python
 author:
-- Dan Keder
+- Dan Keder (@dankeder)
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/system/solaris_zone.py b/lib/ansible/modules/system/solaris_zone.py
index bbeb80332c..87c94674f2 100644
--- a/lib/ansible/modules/system/solaris_zone.py
+++ b/lib/ansible/modules/system/solaris_zone.py
@@ -19,7 +19,7 @@ description:
      changing of options for a zone that's already been created.
 version_added: "2.0"
 author:
-- Paul Markham
+- Paul Markham (@pmarkham)
 requirements:
   - Solaris 10 or 11
 options:
diff --git a/lib/ansible/modules/web_infrastructure/jenkins_script.py b/lib/ansible/modules/web_infrastructure/jenkins_script.py
index 90f699ac44..fffe95273c 100644
--- a/lib/ansible/modules/web_infrastructure/jenkins_script.py
+++ b/lib/ansible/modules/web_infrastructure/jenkins_script.py
@@ -16,7 +16,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.1',
 
 DOCUMENTATION = '''
 ---
-author: James Hogarth
+author: James Hogarth (@hogarthj)
 module: jenkins_script
 short_description: Executes a groovy script in the jenkins instance
 version_added: '2.3'