diff --git a/file b/file
index 1a506689899..e9089c569d1 100755
--- a/file
+++ b/file
@@ -31,7 +31,7 @@ def add_path_info(kwargs):
     path = kwargs['path']
     if os.path.exists(path):
         (user, group) = user_and_group(path)
-        kwargs['user']  = user
+        kwargs['owner']  = user
         kwargs['group'] = group
         st = os.stat(path)
         kwargs['mode']  = oct(stat.S_IMODE(st[stat.ST_MODE]))
@@ -209,13 +209,10 @@ def set_mode_if_different(path, mode, changed):
 def rmtree_error(func, path, exc_info):
     module_fail_json(path=path, msg='failed to remove directory')
 
-# ===========================================
-# go...
-
 def main():
 
     global module
-    module = AnsibleModule(
+    module = AnsibleFileModule(
         argument_spec = dict(
             state = dict(choices=['file','directory','link','absent'], default='file'),
             path  = dict(aliases=['dest', 'name'], required=True),
@@ -351,6 +348,12 @@ def main():
 
 # this is magic, see lib/ansible/module_common.py
 #<<INCLUDE_ANSIBLE_MODULE_COMMON>>
-main()
 
+class AnsibleFileModule(AnsibleModule):
+
+    def _check_invalid_arguments(self):
+        # needed to support daisy chaining
+        pass
+
+main()
 
diff --git a/git b/git
index a8806c704ca..61abfc376b8 100755
--- a/git
+++ b/git
@@ -142,7 +142,7 @@ def main():
     module = AnsibleModule(
         argument_spec = dict(
             dest=dict(required=True),
-            repo=dict(required=True),
+            repo=dict(required=True, aliases=['name']),
             version=dict(default='HEAD'),
             remote=dict(default='origin')
         )
diff --git a/mysql_db b/mysql_db
index 47cf0bee315..157c0500137 100755
--- a/mysql_db
+++ b/mysql_db
@@ -70,7 +70,7 @@ def main():
             login_user=dict(default=None),
             login_password=dict(default=None),
             login_host=dict(default="localhost"),
-            db=dict(required=True),
+            db=dict(required=True, aliases=['name']),
             encoding=dict(default=""),
             collation=dict(default=""),
             state=dict(default="present", choices=["absent", "present"]),
diff --git a/mysql_user b/mysql_user
index 38b44c44902..b09b1fbd19a 100755
--- a/mysql_user
+++ b/mysql_user
@@ -164,7 +164,7 @@ def main():
             login_user=dict(default=None),
             login_password=dict(default=None),
             login_host=dict(default="localhost"),
-            user=dict(required=True),
+            user=dict(required=True, aliases=['name']),
             password=dict(default=None),
             host=dict(default="localhost"),
             state=dict(default="present", choices=["absent", "present"]),
diff --git a/postgresql_db b/postgresql_db
index baa1fb568b2..9c5f3b8a65d 100755
--- a/postgresql_db
+++ b/postgresql_db
@@ -57,7 +57,7 @@ def main():
             login_user=dict(default="postgres"),
             login_password=dict(default=""),
             login_host=dict(default=""),
-            db=dict(required=True),
+            db=dict(required=True, aliases=['name']),
             owner=dict(default=""),
             template=dict(default=""),
             encoding=dict(default=""),
diff --git a/postgresql_user b/postgresql_user
index 95e72de0c87..a097051df30 100755
--- a/postgresql_user
+++ b/postgresql_user
@@ -106,7 +106,7 @@ def main():
             login_user=dict(default="postgres"),
             login_password=dict(default=""),
             login_host=dict(default=""),
-            user=dict(required=True),
+            user=dict(required=True, aliases=['name']),
             password=dict(default=None),
             state=dict(default="present", choices=["absent", "present"]),
             db=dict(required=True),