diff --git a/src/user/create.js b/src/user/create.js
index ab413a545d..c629f76020 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -46,7 +46,7 @@ module.exports = function (User) {
 
 			async.parallel({
 				renamedUsername: function (next) {
-					User.renameUsername(userData, next);
+					User.uniqueUsername(userData, next);
 				},
 				userData: function (next) {
 					plugins.fireHook('filter:user.create', { user: userData, data: data }, next);
@@ -200,7 +200,7 @@ module.exports = function (User) {
 		callback();
 	};
 
-	User.renameUsername = function (userData, callback) {
+	User.uniqueUsername = function (userData, callback) {
 		meta.userOrGroupExists(userData.userslug, function (err, exists) {
 			if (err || !exists) {
 				return callback(err);
diff --git a/test/user.js b/test/user.js
index c83e8cd411..08d3ba42d4 100644
--- a/test/user.js
+++ b/test/user.js
@@ -70,7 +70,7 @@ describe('User', function () {
 		});
 	});
 
-	describe('.renameUsername()', function () {
+	describe('.uniqueUsername()', function () {
 		it('should deal with collisions', function (done) {
 			var users = [];
 			for (var i = 0; i < 10; i += 1) {
@@ -88,7 +88,7 @@ describe('User', function () {
 					}, next);
 				},
 				function (next) {
-					User.renameUsername({
+					User.uniqueUsername({
 						username: 'Jane Doe',
 						userslug: 'jane-doe',
 					}, function (err, username) {