diff --git a/src/login.js b/src/login.js
index 2a84fbca14..51f3ed5472 100644
--- a/src/login.js
+++ b/src/login.js
@@ -17,7 +17,7 @@ var user = require('./user.js'),
 
 			var userslug = utils.slugify(username);
 
-			user.get_uid_by_userslug(userslug, function(err, uid) {
+			user.getUidByUserslug(userslug, function(err, uid) {
 
 				if (err) {
 					return next(new Error('redis-error'));
@@ -58,7 +58,7 @@ var user = require('./user.js'),
 	}
 
 	Login.loginViaTwitter = function(twid, handle, photos, callback) {
-		user.get_uid_by_twitter_id(twid, function(uid) {
+		user.getUidByTwitterId(twid, function(uid) {
 			if (uid !== null) {
 				// Existing User
 				callback(null, {
@@ -92,7 +92,7 @@ var user = require('./user.js'),
 	}
 
 	Login.loginViaGoogle = function(gplusid, handle, email, callback) {
-		user.get_uid_by_google_id(gplusid, function(uid) {
+		user.getUidByGoogleId(gplusid, function(uid) {
 			if (uid !== null) {
 				// Existing User
 				callback(null, {
@@ -109,7 +109,7 @@ var user = require('./user.js'),
 					});
 				}
 
-				user.get_uid_by_email(email, function(uid) {
+				user.getUidByEmail(email, function(uid) {
 					if (!uid) {
 						user.create(handle, undefined, email, function(err, uid) {
 							if (err !== null) {
@@ -123,7 +123,7 @@ var user = require('./user.js'),
 	}
 
 	Login.loginViaFacebook = function(fbid, name, email, callback) {
-		user.get_uid_by_fbid(fbid, function(uid) {
+		user.getUidByFbid(fbid, function(uid) {
 			if (uid !== null) {
 				// Existing User
 				callback(null, {
@@ -140,7 +140,7 @@ var user = require('./user.js'),
 					});
 				}
 
-				user.get_uid_by_email(email, function(uid) {
+				user.getUidByEmail(email, function(uid) {
 					if (!uid) {
 						user.create(name, undefined, email, function(err, uid) {
 							if (err !== null) {
diff --git a/src/routes/user.js b/src/routes/user.js
index 62b8560b97..9f219c90f0 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -94,7 +94,7 @@ var user = require('./../user.js'),
 					return;
 				}
 
-				user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+				user.getUidByUserslug(req.params.userslug, function (err, uid) {
 					if (!uid) {
 						return next();
 					}
@@ -241,7 +241,7 @@ var user = require('./../user.js'),
 			if (!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
 				if (!uid) {
 					res.redirect('/404');
 					return;
@@ -261,7 +261,7 @@ var user = require('./../user.js'),
 			if (!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
 				if (!uid) {
 					res.redirect('/404');
 					return;
@@ -280,7 +280,7 @@ var user = require('./../user.js'),
 			if (!req.user)
 				return res.redirect('/403');
 
-			user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
 				if (!uid) {
 					res.redirect('/404');
 					return;
@@ -342,7 +342,7 @@ var user = require('./../user.js'),
 		app.get('/api/user/:userslug/settings', function (req, res, next) {
 			var callerUID = req.user ? req.user.uid : '0';
 
-			user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
 				if (!uid) {
 					res.json(404, {
 						error: 'User not found!'
@@ -380,7 +380,7 @@ var user = require('./../user.js'),
 		app.get('/api/user/:userslug/favourites', function (req, res, next) {
 			var callerUID = req.user ? req.user.uid : '0';
 
-			user.get_uid_by_userslug(req.params.userslug, function (err, uid) {
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
 				if (!uid) {
 					res.json(404, {
 						error: 'User not found!'
@@ -526,7 +526,7 @@ var user = require('./../user.js'),
 		}
 
 		function getUserDataByUserSlug(userslug, callerUID, callback) {
-			user.get_uid_by_userslug(userslug, function (err, uid) {
+			user.getUidByUserslug(userslug, function (err, uid) {
 
 				if (uid === null) {
 					callback(null);
diff --git a/src/user.js b/src/user.js
index 51d86ef5b0..0705d50611 100644
--- a/src/user.js
+++ b/src/user.js
@@ -602,10 +602,10 @@ var utils = require('./../public/src/utils.js'),
 	}
 
 	User.exists = function(userslug, callback) {
-		User.get_uid_by_userslug(userslug, function(err, exists) {
+		User.getUidByUserslug(userslug, function(err, exists) {
 			callback( !! exists);
 		});
-	};
+	}
 
 	User.count = function(socket) {
 		RDB.get('usercount', function(err, count) {
@@ -615,7 +615,7 @@ var utils = require('./../public/src/utils.js'),
 				count: count ? count : 0
 			});
 		});
-	};
+	}
 
 	User.latest = function(socket) {
 		RDB.zrevrange('users:joindate', 0, 0, function(err, uid) {
@@ -631,15 +631,15 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.get_uid_by_username = function(username, callback) {
+	User.getUidByUsername = function(username, callback) {
 		RDB.hget('username:uid', username, callback);
-	};
+	}
 
-	User.get_uid_by_userslug = function(userslug, callback) {
+	User.getUidByUserslug = function(userslug, callback) {
 		RDB.hget('userslug:uid', userslug, callback);
-	};
+	}
 
-	User.get_usernames_by_uids = function(uids, callback) {
+	User.getUsernamesByUids = function(uids, callback) {
 		var usernames = [];
 
 		if (!Array.isArray(uids)) {
@@ -658,7 +658,7 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.get_userslugs_by_uids = function(uids, callback) {
+	User.getUserSlugsByUids = function(uids, callback) {
 		var userslugs = [];
 
 		if (!Array.isArray(uids)) {
@@ -677,16 +677,16 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.get_uid_by_email = function(email, callback) {
+	User.getUidByEmail = function(email, callback) {
 		RDB.hget('email:uid', email, function(err, data) {
 			if (err) {
 				RDB.handle(err);
 			}
 			callback(data);
 		});
-	};
+	}
 
-	User.get_uid_by_twitter_id = function(twid, callback) {
+	User.getUidByTwitterId = function(twid, callback) {
 		RDB.hget('twid:uid', twid, function(err, uid) {
 			if (err) {
 				RDB.handle(err);
@@ -695,7 +695,7 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.get_uid_by_google_id = function(gplusid, callback) {
+	User.getUidByGoogleId = function(gplusid, callback) {
 		RDB.hget('gplusid:uid', gplusid, function(err, uid) {
 			if (err) {
 				RDB.handle(err);
@@ -704,7 +704,7 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
-	User.get_uid_by_fbid = function(fbid, callback) {
+	User.getUidByFbid = function(fbid, callback) {
 		RDB.hget('fbid:uid', fbid, function(err, uid) {
 			if (err) {
 				RDB.handle(err);
@@ -779,7 +779,7 @@ var utils = require('./../public/src/utils.js'),
 			});
 		},
 		send: function(socket, email) {
-			User.get_uid_by_email(email, function(uid) {
+			User.getUidByEmail(email, function(uid) {
 				if (uid !== null) {
 					// Generate a new reset code
 					var reset_code = utils.generateUUID();
@@ -855,7 +855,7 @@ var utils = require('./../public/src/utils.js'),
 
 	User.email = {
 		exists: function(socket, email, callback) {
-			User.get_uid_by_email(email, function(exists) {
+			User.getUidByEmail(email, function(exists) {
 				exists = !! exists;
 				if (typeof callback !== 'function') {
 					socket.emit('user.email.exists', {