diff --git a/combobox.html b/combobox.html
index 63a2c9757..383dbe325 100644
--- a/combobox.html
+++ b/combobox.html
@@ -61,7 +61,7 @@
         <script src='js/id/ui/commit.js'></script>
         <script src='js/id/ui/success.js'></script>
         <script src='js/id/ui/loading.js'></script>
-        <script src='js/id/ui/userpanel.js'></script>
+        <script src='js/id/ui/account.js'></script>
         <script src='js/id/ui/layerswitcher.js'></script>
         <script src='js/id/ui/contributors.js'></script>
         <script src='js/id/ui/geocoder.js'></script>
diff --git a/css/app.css b/css/app.css
index 4cb56f910..11e710970 100644
--- a/css/app.css
+++ b/css/app.css
@@ -936,11 +936,11 @@ img.tile {
 
 /* Account Information */
 
-.user-container {
+.account {
     float: left;
 }
 
-.user-container .logout {
+.account .logout {
     margin-left:10px;
     border-left: 1px solid white;
     padding-left: 10px;
diff --git a/index.html b/index.html
index 6e8661145..61790eae0 100644
--- a/index.html
+++ b/index.html
@@ -66,7 +66,7 @@
         <script src='js/id/ui/commit.js'></script>
         <script src='js/id/ui/success.js'></script>
         <script src='js/id/ui/loading.js'></script>
-        <script src='js/id/ui/userpanel.js'></script>
+        <script src='js/id/ui/account.js'></script>
         <script src='js/id/ui/layerswitcher.js'></script>
         <script src='js/id/ui/modes.js'></script>
         <script src='js/id/ui/contributors.js'></script>
diff --git a/js/id/ui.js b/js/id/ui.js
index 115199edf..086cd59a4 100644
--- a/js/id/ui.js
+++ b/js/id/ui.js
@@ -61,7 +61,7 @@ iD.ui = function(context) {
             .attr('class','col12 about-block fillD pad1');
 
         about.append('div')
-            .attr('class', 'user-container')
+            .attr('class', 'account')
             .call(iD.ui.UserPanel(context));
 
         var linkList = about.append('ul')
diff --git a/js/id/ui/userpanel.js b/js/id/ui/account.js
similarity index 97%
rename from js/id/ui/userpanel.js
rename to js/id/ui/account.js
index f323706ae..5e9fe7705 100644
--- a/js/id/ui/userpanel.js
+++ b/js/id/ui/account.js
@@ -1,4 +1,4 @@
-iD.ui.UserPanel = function(context) {
+iD.ui.Account = function(context) {
     var connection = context.connection();
 
     function update(selection) {
diff --git a/test/index.html b/test/index.html
index dcea8e28c..05482ab1f 100644
--- a/test/index.html
+++ b/test/index.html
@@ -63,7 +63,7 @@
     <script src='../js/id/ui/inspector.js'></script>
     <script src='../js/id/ui/commit.js'></script>
     <script src='../js/id/ui/loading.js'></script>
-    <script src='../js/id/ui/userpanel.js'></script>
+    <script src='../js/id/ui/account.js'></script>
     <script src='../js/id/ui/geocoder.js'></script>
     <script src='../js/id/ui/notice.js'></script>
     <script src='../js/id/ui/modal.js'></script>