diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserInfoController.coffee
similarity index 100%
rename from services/web/app/coffee/Features/User/UserController.coffee
rename to services/web/app/coffee/Features/User/UserInfoController.coffee
diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee
index 92b09b0858..dbc80f66c5 100644
--- a/services/web/app/coffee/router.coffee
+++ b/services/web/app/coffee/router.coffee
@@ -23,7 +23,7 @@ TemplatesMiddlewear = require('./Features/Templates/TemplatesMiddlewear')
 AuthenticationController = require('./Features/Authentication/AuthenticationController')
 TagsController = require("./Features/Tags/TagsController")
 CollaboratorsController = require('./Features/Collaborators/CollaboratorsController')
-PersonalInfoController = require('./Features/User/UserController')
+UserInfoController = require('./Features/User/UserInfoController')
 UserPagesController = require('./Features/User/UserPagesController')
 DocumentController = require('./Features/Documents/DocumentController')
 CompileManager = require("./Features/Compile/CompileManager")
@@ -36,8 +36,6 @@ DropboxUserController = require("./Features/Dropbox/DropboxUserController")
 logger = require("logger-sharelatex")
 _ = require("underscore")
 
-console.log PersonalInfoController
-
 httpAuth = require('express').basicAuth (user, pass)->
 	isValid = Settings.httpAuthUsers[user] == pass
 	if !isValid
@@ -82,15 +80,15 @@ module.exports = class Router
 		app.get  '/user/passwordreset', UserPagesController.passwordResetPage
 		app.post '/user/passwordReset', UserController.doRequestPasswordReset
 		app.del  '/user/newsletter/unsubscribe', AuthenticationController.requireLogin(), UserController.unsubscribe
-		app.del  '/user', AuthenticationController.requireLogin(), PersonalInfoController.deleteUser
+		app.del  '/user', AuthenticationController.requireLogin(), UserInfoController.deleteUser
 
 		app.get  '/dropbox/beginAuth', DropboxUserController.redirectUserToDropboxAuth
 		app.get  '/dropbox/completeRegistration', DropboxUserController.completeDropboxRegistration
 		app.get  '/dropbox/unlink', DropboxUserController.unlinkDropbox
 
 		app.get  '/user/auth_token', AuthenticationController.requireLogin(), AuthenticationController.getAuthToken
-		app.get  '/user/personal_info', AuthenticationController.requireLogin(allow_auth_token: true), PersonalInfoController.getLoggedInUsersPersonalInfo
-		app.get  '/user/:user_id/personal_info', httpAuth, PersonalInfoController.getPersonalInfo
+		app.get  '/user/personal_info', AuthenticationController.requireLogin(allow_auth_token: true), UserInfoController.getLoggedInUsersPersonalInfo
+		app.get  '/user/:user_id/personal_info', httpAuth, UserInfoController.getPersonalInfo
 		
 		app.get  '/project', AuthenticationController.requireLogin(), ProjectController.projectListPage
 		app.post '/project/new', AuthenticationController.requireLogin(), ProjectController.newProject
diff --git a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee b/services/web/test/UnitTests/coffee/User/UserInfoControllerTests.coffee
similarity index 74%
rename from services/web/test/UnitTests/coffee/User/UserControllerTests.coffee
rename to services/web/test/UnitTests/coffee/User/UserInfoControllerTests.coffee
index 13902d0087..e070fd6ffe 100644
--- a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/User/UserInfoControllerTests.coffee
@@ -2,18 +2,18 @@ sinon = require('sinon')
 chai = require('chai')
 should = chai.should()
 expect = chai.expect
-modulePath = "../../../../app/js/Features/User/UserController.js"
+modulePath = "../../../../app/js/Features/User/UserInfoController.js"
 SandboxedModule = require('sandboxed-module')
 events = require "events"
 MockResponse = require "../helpers/MockResponse"
 MockRequest = require "../helpers/MockRequest"
 ObjectId = require("mongojs").ObjectId
 
-describe "UserController", ->
+describe "UserInfoController", ->
 	beforeEach ->
 		@UserDeleter = 
 			deleteUser: sinon.stub().callsArgWith(1)
-		@UserController = SandboxedModule.require modulePath, requires:
+		@UserInfoController = SandboxedModule.require modulePath, requires:
 			"./UserGetter": @UserGetter = {}
 			"./UserDeleter": @UserDeleter
 
@@ -26,11 +26,11 @@ describe "UserController", ->
 			@user =
 				_id: ObjectId()
 			@req.user = @user
-			@UserController.sendFormattedPersonalInfo = sinon.stub()
-			@UserController.getLoggedInUsersPersonalInfo(@req, @res, @next)
+			@UserInfoController.sendFormattedPersonalInfo = sinon.stub()
+			@UserInfoController.getLoggedInUsersPersonalInfo(@req, @res, @next)
 
 		it "should call sendFormattedPersonalInfo", ->
-			@UserController.sendFormattedPersonalInfo
+			@UserInfoController.sendFormattedPersonalInfo
 				.calledWith(@user, @res, @next)
 				.should.equal true
 
@@ -44,8 +44,8 @@ describe "UserController", ->
 		describe "when the user exists", ->
 			beforeEach ->
 				@UserGetter.getUser = sinon.stub().callsArgWith(2, null, @user)
-				@UserController.sendFormattedPersonalInfo = sinon.stub()
-				@UserController.getPersonalInfo(@req, @res, @next)
+				@UserInfoController.sendFormattedPersonalInfo = sinon.stub()
+				@UserInfoController.getPersonalInfo(@req, @res, @next)
 
 			it "should look up the user in the database", ->
 				@UserGetter.getUser
@@ -53,15 +53,15 @@ describe "UserController", ->
 					.should.equal true
 				
 			it "should send the formatted details back to the client", ->
-				@UserController.sendFormattedPersonalInfo
+				@UserInfoController.sendFormattedPersonalInfo
 					.calledWith(@user, @res, @next)
 					.should.equal true
 
 		describe "when the user does not exist", ->
 			beforeEach ->
 				@UserGetter.getUser = sinon.stub().callsArgWith(2, null, null)
-				@UserController.sendFormattedPersonalInfo = sinon.stub()
-				@UserController.getPersonalInfo(@req, @res, @next)
+				@UserInfoController.sendFormattedPersonalInfo = sinon.stub()
+				@UserInfoController.getPersonalInfo(@req, @res, @next)
 
 			it "should return 404 to the client", ->
 				@res.statusCode.should.equal 404
@@ -78,11 +78,11 @@ describe "UserController", ->
 				first_name: @user.first_name
 				last_name: @user.last_name
 				email: @user.email
-			@UserController._formatPersonalInfo = sinon.stub().callsArgWith(1, null, @formattedInfo)
-			@UserController.sendFormattedPersonalInfo @user, @res
+			@UserInfoController._formatPersonalInfo = sinon.stub().callsArgWith(1, null, @formattedInfo)
+			@UserInfoController.sendFormattedPersonalInfo @user, @res
 
 		it "should format the user details for the response", ->
-			@UserController._formatPersonalInfo
+			@UserInfoController._formatPersonalInfo
 				.calledWith(@user)
 				.should.equal true
 
@@ -98,7 +98,7 @@ describe "UserController", ->
 				email: "doug@sharelatex.com"
 				password: "should-not-get-included"
 				signUpDate: new Date()
-			@UserController._formatPersonalInfo @user, (error, info) =>
+			@UserInfoController._formatPersonalInfo @user, (error, info) =>
 				expect(info).to.deep.equal {
 					id: @user._id.toString()
 					first_name: @user.first_name
@@ -118,7 +118,7 @@ describe "UserController", ->
 				@UserDeleter.deleteUser.calledWith(user_id)
 				code.should.equal 200
 				done()
-			@UserController.deleteUser @req, @res
+			@UserInfoController.deleteUser @req, @res