diff --git a/cloud/ec2_vpc b/cloud/ec2_vpc
index 42b44e72bc8..87713a0d5e7 100644
--- a/cloud/ec2_vpc
+++ b/cloud/ec2_vpc
@@ -109,14 +109,14 @@ EXAMPLES = '''
 
 # Basic creation example:
       local_action:
-        module: vpc
+        module: ec2_vpc
         state: present
         cidr_block: 172.23.0.0/16
         region: us-west-2
 # Full creation example with subnets and optional availability zones.
 # The absence or presense of subnets deletes or creates them respectively.
       local_action:
-        module: vpc
+        module: ec2_vpc
         state: present
         cidr_block: 172.22.0.0/16
         subnets: 
@@ -144,7 +144,7 @@ EXAMPLES = '''
 
 # Removal of a VPC by id
       local_action:
-        module: vpc
+        module: ec2_vpc
         state: absent
         vpc_id: vpc-aaaaaaa 
         region: us-west-2  
diff --git a/source_control/githooks b/source_control/github_hooks
similarity index 94%
rename from source_control/githooks
rename to source_control/github_hooks
index b79fb04d5af..04438556356 100644
--- a/source_control/githooks
+++ b/source_control/github_hooks
@@ -24,7 +24,7 @@ import base64
 
 DOCUMENTATION = '''
 ---
-module: githooks
+module: github_hooks
 short_description: Manages github service hooks.
 description:
      - Adds service hooks and removes service hooks that have an error status.
@@ -56,10 +56,10 @@ author: Phillip Gentry, CX Inc
 
 EXAMPLES = '''
 # Example creating a new service hook. It ignores duplicates.
-- githooks: action=create hookurl=http://11.111.111.111:2222 user={{ gituser }} oauthkey={{ oauthkey }} repo=https://api.github.com/repos/pcgentry/Github-Auto-Deploy
+- github_hooks: action=create hookurl=http://11.111.111.111:2222 user={{ gituser }} oauthkey={{ oauthkey }} repo=https://api.github.com/repos/pcgentry/Github-Auto-Deploy
 
 # Cleaning all hooks for this repo that had an error on the last update. Since this works for all hooks in a repo it is probably best that this would be called from a handler.
-- local_action: githooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }}
+- local_action: github_hooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }}
 '''
 
 def list(hookurl, oauthkey, repo, user):
diff --git a/system/blacklist b/system/kernel_blacklist
similarity index 98%
rename from system/blacklist
rename to system/kernel_blacklist
index 2b9c7b44e26..71f962f18ce 100644
--- a/system/blacklist
+++ b/system/kernel_blacklist
@@ -24,7 +24,7 @@ import re
 
 DOCUMENTATION = '''
 ---
-module: blacklist
+module: kernel_blacklist
 author: Matthias Vogelgesang
 version_added: 1.4
 short_description: Blacklist kernel modules
@@ -52,7 +52,7 @@ requirements: []
 
 EXAMPLES = '''
 # Blacklist the nouveau driver module
-- blacklist: name=nouveau state=present
+- kernel_blacklist: name=nouveau state=present
 '''