diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js
index 9eb408ad43..3c9bf01824 100644
--- a/packages/accounts-password/package.js
+++ b/packages/accounts-password/package.js
@@ -8,15 +8,15 @@ Package.on_use(function(api) {
   api.use('email', ['server']);
 
   api.add_files('email_templates.js', 'server');
-  api.add_files('passwords_server.js', 'server');
-  api.add_files('passwords_client.js', 'client');
-  api.add_files('passwords_common.js', ['server', 'client']);
+  api.add_files('password_server.js', 'server');
+  api.add_files('password_client.js', 'client');
+  api.add_files('password_common.js', ['server', 'client']);
 });
 
 Package.on_test(function(api) {
   api.use(['accounts-password', 'tinytest', 'test-helpers', 'deps']);
-  api.add_files('passwords_tests_setup.js', 'server');
-  api.add_files('passwords_tests.js', ['client', 'server']);
+  api.add_files('password_tests_setup.js', 'server');
+  api.add_files('password_tests.js', ['client', 'server']);
   api.add_files('email_tests_setup.js', 'server');
   api.add_files('email_tests.js', 'client');
 });
diff --git a/packages/accounts-password/passwords_client.js b/packages/accounts-password/password_client.js
similarity index 100%
rename from packages/accounts-password/passwords_client.js
rename to packages/accounts-password/password_client.js
diff --git a/packages/accounts-password/passwords_common.js b/packages/accounts-password/password_common.js
similarity index 100%
rename from packages/accounts-password/passwords_common.js
rename to packages/accounts-password/password_common.js
diff --git a/packages/accounts-password/passwords_server.js b/packages/accounts-password/password_server.js
similarity index 100%
rename from packages/accounts-password/passwords_server.js
rename to packages/accounts-password/password_server.js
diff --git a/packages/accounts-password/passwords_tests.js b/packages/accounts-password/password_tests.js
similarity index 100%
rename from packages/accounts-password/passwords_tests.js
rename to packages/accounts-password/password_tests.js
diff --git a/packages/accounts-password/passwords_tests_setup.js b/packages/accounts-password/password_tests_setup.js
similarity index 100%
rename from packages/accounts-password/passwords_tests_setup.js
rename to packages/accounts-password/password_tests_setup.js