diff --git a/src/users.js b/src/users.js
index 7bd32a18b..14dd2d371 100644
--- a/src/users.js
+++ b/src/users.js
@@ -1,33 +1,33 @@
 'use strict';
 
 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    removeRestrictedFields: removeRestrictedFields,
+    removePrivateFields,
+    removeRestrictedFields,
 
-    getAll: getAll,
-    getAllPaged: getAllPaged,
-    create: create,
-    isActivated: isActivated,
-    verify: verify,
-    verifyWithUsername: verifyWithUsername,
-    verifyWithEmail: verifyWithEmail,
-    remove: removeUser,
-    get: get,
-    getByResetToken: getByResetToken,
-    getByUsername: getByUsername,
-    getAdmins: getAdmins,
-    setPassword: setPassword,
-    update: update,
-    createOwner: createOwner,
-    getOwner: getOwner,
-    createInvite: createInvite,
-    sendInvite: sendInvite,
-    setMembership: setMembership,
-    setTwoFactorAuthenticationSecret: setTwoFactorAuthenticationSecret,
-    enableTwoFactorAuthentication: enableTwoFactorAuthentication,
-    disableTwoFactorAuthentication: disableTwoFactorAuthentication,
+    getAll,
+    getAllPaged,
+    create,
+    isActivated,
+    verify,
+    verifyWithUsername,
+    verifyWithEmail,
+    remove,
+    get,
+    getByResetToken,
+    getByUsername,
+    getAdmins,
+    setPassword,
+    update,
+    createOwner,
+    getOwner,
+    createInvite,
+    sendInvite,
+    setMembership,
+    setTwoFactorAuthenticationSecret,
+    enableTwoFactorAuthentication,
+    disableTwoFactorAuthentication,
 
-    sendPasswordResetByIdentifier: sendPasswordResetByIdentifier,
+    sendPasswordResetByIdentifier,
 
     setupAccount,
     getAvatarUrlSync,
@@ -35,7 +35,7 @@ exports = module.exports = {
     setAvatar,
     clearAvatar,
 
-    count: count,
+    count,
 
     AP_MAIL: 'mail',
     AP_WEBADMIN: 'webadmin',
@@ -44,12 +44,12 @@ exports = module.exports = {
     ROLE_USER: 'user',
     ROLE_USER_MANAGER: 'usermanager',
     ROLE_OWNER: 'owner',
-    compareRoles: compareRoles,
+    compareRoles,
 
-    getAppPasswords: getAppPasswords,
-    getAppPassword: getAppPassword,
-    addAppPassword: addAppPassword,
-    delAppPassword: delAppPassword
+    getAppPasswords,
+    getAppPassword,
+    addAppPassword,
+    delAppPassword
 };
 
 const ORDERED_ROLES = [ exports.ROLE_USER, exports.ROLE_USER_MANAGER, exports.ROLE_ADMIN, exports.ROLE_OWNER ];
@@ -318,7 +318,7 @@ function verifyWithEmail(email, password, identifier, callback) {
     });
 }
 
-function removeUser(user, auditSource, callback) {
+function remove(user, auditSource, callback) {
     assert.strictEqual(typeof user, 'object');
     assert(auditSource && typeof auditSource === 'object');
     assert.strictEqual(typeof callback, 'function');