diff --git a/bin/ansible-vault b/bin/ansible-vault
index 9fd19bda2e..6c793b871a 100755
--- a/bin/ansible-vault
+++ b/bin/ansible-vault
@@ -112,7 +112,7 @@ def execute_create(args, options, parser):
     if len(args) > 1:
         raise errors.AnsibleError("create does not accept more than one filename")        
 
-    password, new_password = utils.ask_vaultpasswords(ask_vault_pass=True, confirm_vault=True)
+    password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
 
     this_vault = _get_vault(args[0], options, password)
     if not hasattr(options, 'cipher'):
@@ -121,7 +121,7 @@ def execute_create(args, options, parser):
 
 def execute_decrypt(args, options, parser):
 
-    password, new_password = utils.ask_vaultpasswords(ask_vault_pass=True)
+    password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
 
     for f in args:
         this_vault = _get_vault(f, options, password)
@@ -134,7 +134,7 @@ def execute_edit(args, options, parser):
     if len(args) > 1:
         raise errors.AnsibleError("create does not accept more than one filename")        
 
-    password, new_password = utils.ask_vaultpasswords(ask_vault_pass=True)
+    password, new_password = utils.ask_vault_passwords(ask_vault_pass=True)
 
     for f in args:
         this_vault = _get_vault(f, options, password)
@@ -142,7 +142,7 @@ def execute_edit(args, options, parser):
 
 def execute_encrypt(args, options, parser):
 
-    password, new_password = utils.ask_vaultpasswords(ask_vault_pass=True, confirm_vault=True)
+    password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, confirm_vault=True)
 
     for f in args:
         this_vault = _get_vault(f, options, password)
@@ -154,7 +154,7 @@ def execute_encrypt(args, options, parser):
 
 def execute_rekey(args, options, parser):
 
-    password, new_password = utils.ask_vaultpasswords(ask_vault_pass=True, ask_new_vault_pass=True, confirm_new=True)
+    password, new_password = utils.ask_vault_passwords(ask_vault_pass=True, ask_new_vault_pass=True, confirm_new=True)
 
     for f in args:
         this_vault = _get_vault(f, options, password)
diff --git a/lib/ansible/utils/__init__.py b/lib/ansible/utils/__init__.py
index 1fabd7f4ff..5bb3ccda7d 100644
--- a/lib/ansible/utils/__init__.py
+++ b/lib/ansible/utils/__init__.py
@@ -763,7 +763,7 @@ def base_parser(constants=C, usage="", output_opts=False, runas_opts=False,
 
     return parser
 
-def ask_vaultpasswords(ask_vault_pass=False, ask_new_vault_pass=False, confirm_vault=False, confirm_new=False):
+def ask_vault_passwords(ask_vault_pass=False, ask_new_vault_pass=False, confirm_vault=False, confirm_new=False):
 
     vault_pass = None
     new_vault_pass = None