diff --git a/lib/ansible/modules/cloud/amazon/_ec2_elb.py b/lib/ansible/modules/cloud/amazon/_ec2_elb.py
new file mode 120000
index 00000000000..d45648c590c
--- /dev/null
+++ b/lib/ansible/modules/cloud/amazon/_ec2_elb.py
@@ -0,0 +1 @@
+elb_instance.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/amazon/_ec2_elb_facts.py b/lib/ansible/modules/cloud/amazon/_ec2_elb_facts.py
new file mode 120000
index 00000000000..ffa3692d0de
--- /dev/null
+++ b/lib/ansible/modules/cloud/amazon/_ec2_elb_facts.py
@@ -0,0 +1 @@
+elb_classic_lb_facts.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/amazon/_ec2_elb_lb.py b/lib/ansible/modules/cloud/amazon/_ec2_elb_lb.py
new file mode 120000
index 00000000000..908d95746dc
--- /dev/null
+++ b/lib/ansible/modules/cloud/amazon/_ec2_elb_lb.py
@@ -0,0 +1 @@
+elb_classic_lb.py
\ No newline at end of file
diff --git a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py b/lib/ansible/modules/cloud/amazon/elb_classic_lb.py
similarity index 99%
rename from lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
rename to lib/ansible/modules/cloud/amazon/elb_classic_lb.py
index cf5991f303c..a2a774ed016 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
+++ b/lib/ansible/modules/cloud/amazon/elb_classic_lb.py
@@ -21,7 +21,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
 
 DOCUMENTATION = """
 ---
-module: ec2_elb_lb
+module: elb_classic_lb
 description:
   - Returns information about the load balancer.
   - Will be marked changed when called only if state is changed.
diff --git a/lib/ansible/modules/cloud/amazon/ec2_elb_facts.py b/lib/ansible/modules/cloud/amazon/elb_classic_lb_facts.py
similarity index 99%
rename from lib/ansible/modules/cloud/amazon/ec2_elb_facts.py
rename to lib/ansible/modules/cloud/amazon/elb_classic_lb_facts.py
index f721d756186..0db67e5b888 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_elb_facts.py
+++ b/lib/ansible/modules/cloud/amazon/elb_classic_lb_facts.py
@@ -20,7 +20,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
 
 DOCUMENTATION = '''
 ---
-module: ec2_elb_facts
+module: elb_classic_lb_facts
 short_description: Gather facts about EC2 Elastic Load Balancers in AWS
 description:
     - Gather facts about EC2 Elastic Load Balancers in AWS
diff --git a/lib/ansible/modules/cloud/amazon/ec2_elb.py b/lib/ansible/modules/cloud/amazon/elb_instance.py
similarity index 99%
rename from lib/ansible/modules/cloud/amazon/ec2_elb.py
rename to lib/ansible/modules/cloud/amazon/elb_instance.py
index b2736bea3e7..c1415adb681 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_elb.py
+++ b/lib/ansible/modules/cloud/amazon/elb_instance.py
@@ -21,7 +21,7 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
 
 DOCUMENTATION = """
 ---
-module: ec2_elb
+module: elb_instance
 short_description: De-registers or registers instances from EC2 ELBs
 description:
   - This module de-registers or registers an AWS EC2 instance from the ELBs
diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt
index 9edf5aa7ddb..6dfa37ada1b 100644
--- a/test/sanity/pep8/legacy-files.txt
+++ b/test/sanity/pep8/legacy-files.txt
@@ -4,6 +4,9 @@ lib/ansible/config/data.py
 lib/ansible/config/manager.py
 lib/ansible/modules/cloud/amazon/_ec2_ami_search.py
 lib/ansible/modules/cloud/amazon/_ec2_remote_facts.py
+lib/ansible/modules/cloud/amazon/_ec2_elb.py
+lib/ansible/modules/cloud/amazon/_ec2_elb_facts.py
+lib/ansible/modules/cloud/amazon/_ec2_elb_lb.py
 lib/ansible/modules/cloud/amazon/_ec2_vpc.py
 lib/ansible/modules/cloud/amazon/aws_kms.py
 lib/ansible/modules/cloud/amazon/cloudformation.py
@@ -16,9 +19,6 @@ lib/ansible/modules/cloud/amazon/ec2_ami_copy.py
 lib/ansible/modules/cloud/amazon/ec2_ami_find.py
 lib/ansible/modules/cloud/amazon/ec2_customer_gateway.py
 lib/ansible/modules/cloud/amazon/ec2_eip.py
-lib/ansible/modules/cloud/amazon/ec2_elb.py
-lib/ansible/modules/cloud/amazon/ec2_elb_facts.py
-lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
 lib/ansible/modules/cloud/amazon/ec2_eni_facts.py
 lib/ansible/modules/cloud/amazon/ec2_key.py
 lib/ansible/modules/cloud/amazon/ec2_lc.py
@@ -46,6 +46,9 @@ lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
 lib/ansible/modules/cloud/amazon/efs.py
 lib/ansible/modules/cloud/amazon/elasticache.py
 lib/ansible/modules/cloud/amazon/elasticache_subnet_group.py
+lib/ansible/modules/cloud/amazon/elb_instance.py
+lib/ansible/modules/cloud/amazon/elb_classic_lb_facts.py
+lib/ansible/modules/cloud/amazon/elb_classic_lb.py
 lib/ansible/modules/cloud/amazon/execute_lambda.py
 lib/ansible/modules/cloud/amazon/iam.py
 lib/ansible/modules/cloud/amazon/iam_policy.py