diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py b/lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py
index 909ec4a9c7..ff9bde8802 100644
--- a/lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py
+++ b/lib/ansible/modules/extras/cloud/amazon/ec2_ami_copy.py
@@ -20,24 +20,21 @@ module: ec2_ami_copy
 short_description: copies AMI between AWS regions, return new image id
 description:
     - Copies AMI from a source region to a destination region. This module has a dependency on python-boto >= 2.5
-version_added: "1.7"
+version_added: "2.0"
 options:
   source_region:
     description:
       - the source region that AMI should be copied from
     required: true
-    default: null
   region:
     description:
       - the destination region that AMI should be copied to
     required: true
-    default: null
     aliases: ['aws_region', 'ec2_region', 'dest_region']
   source_image_id:
     description:
       - the id of the image in source region that should be copied
     required: true
-    default: null
   name:
     description:
       - The name of the new image to copy
diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_eni.py b/lib/ansible/modules/extras/cloud/amazon/ec2_eni.py
index 2b34e9b940..9e878e7d55 100644
--- a/lib/ansible/modules/extras/cloud/amazon/ec2_eni.py
+++ b/lib/ansible/modules/extras/cloud/amazon/ec2_eni.py
@@ -25,13 +25,13 @@ options:
   eni_id:
     description:
       - The ID of the ENI
-    required = false
-    default = null
+    required: false
+    default: null
   instance_id:
     description:
       - Instance ID that you wish to attach ENI to. To detach an ENI from an instance, use 'None'.
     required: false
-    default: null 
+    default: null
   private_ip_address:
     description:
       - Private IP address.
diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py b/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
index 76347c8426..981358c33a 100644
--- a/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
+++ b/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
@@ -25,8 +25,8 @@ options:
   eni_id:
     description:
       - The ID of the ENI. Pass this option to gather facts about a particular ENI, otherwise, all ENIs are returned.
-    required = false
-    default = null
+    required: false
+    default: null
 extends_documentation_fragment: aws
 '''
 
diff --git a/lib/ansible/modules/extras/cloud/vmware/vsphere_copy b/lib/ansible/modules/extras/cloud/vmware/vsphere_copy.py
similarity index 96%
rename from lib/ansible/modules/extras/cloud/vmware/vsphere_copy
rename to lib/ansible/modules/extras/cloud/vmware/vsphere_copy.py
index 0ca9780c00..7c044a7d51 100644
--- a/lib/ansible/modules/extras/cloud/vmware/vsphere_copy
+++ b/lib/ansible/modules/extras/cloud/vmware/vsphere_copy.py
@@ -55,8 +55,8 @@ options:
       - The file to push to the datastore on the vCenter server.
     required: true
 notes:
-  - This module ought to be run from a system that can access vCenter directly and has the file to transfer.
-    It can be the normal remote target or you can change it either by using C(transport: local) or using C(delegate_to).
+  - "This module ought to be run from a system that can access vCenter directly and has the file to transfer.
+    It can be the normal remote target or you can change it either by using C(transport: local) or using C(delegate_to)."
   - Tested on vSphere 5.5
 '''