diff --git a/js/Makefile.am b/js/Makefile.am
index f0282f2fa..25af72552 100644
--- a/js/Makefile.am
+++ b/js/Makefile.am
@@ -56,7 +56,6 @@ nobase_dist_js_DATA = 	\
 	ui/searchDisplay.js	\
 	ui/shellDBus.js		\
 	ui/statusIconDispatcher.js	\
-	ui/statusMenu.js	\
 	ui/status/accessibility.js	\
 	ui/status/keyboard.js	\
 	ui/status/network.js	\
@@ -65,6 +64,7 @@ nobase_dist_js_DATA = 	\
 	ui/status/bluetooth.js	\
 	ui/telepathyClient.js	\
 	ui/tweener.js		\
+	ui/userMenu.js		\
 	ui/viewSelector.js	\
 	ui/windowAttentionHandler.js	\
 	ui/windowManager.js	\
diff --git a/js/ui/panel.js b/js/ui/panel.js
index ff181c601..987ca2b8c 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -16,7 +16,7 @@ const Layout = imports.ui.layout;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
 const PanelMenu = imports.ui.panelMenu;
-const StatusMenu = imports.ui.statusMenu;
+const UserMenu = imports.ui.userMenu;
 const DateMenu = imports.ui.dateMenu;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
@@ -954,7 +954,7 @@ Panel.prototype = {
         this._rightBox.add(this._statusBox);
 
         if (global.session_type == Shell.SessionType.USER) {
-            this._userMenu = new StatusMenu.StatusMenuButton();
+            this._userMenu = new UserMenu.UserMenuButton();
             this._userMenu.actor.name = 'panelStatus';
             this._rightBox.add(this._userMenu.actor);
         }
diff --git a/js/ui/statusMenu.js b/js/ui/userMenu.js
similarity index 99%
rename from js/ui/statusMenu.js
rename to js/ui/userMenu.js
index 2f16cbc42..0d53b54ea 100644
--- a/js/ui/statusMenu.js
+++ b/js/ui/userMenu.js
@@ -27,11 +27,11 @@ const DISABLE_LOG_OUT_KEY = 'disable-log-out';
 // Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>.
 // Copyright (C) 2008,2009 Red Hat, Inc.
 
-function StatusMenuButton() {
+function UserMenuButton() {
     this._init();
 }
 
-StatusMenuButton.prototype = {
+UserMenuButton.prototype = {
     __proto__: PanelMenu.Button.prototype,
 
     _init: function() {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f309c03e1..d71ff28bf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,11 +26,11 @@ js/ui/shellMountOperation.js
 js/ui/status/accessibility.js
 js/ui/status/bluetooth.js
 js/ui/status/keyboard.js
-js/ui/statusMenu.js
 js/ui/status/network.js
 js/ui/status/power.js
 js/ui/status/volume.js
 js/ui/telepathyClient.js
+js/ui/userMenu.js
 js/ui/viewSelector.js
 js/ui/windowAttentionHandler.js
 src/gvc/gvc-mixer-control.c