diff --git a/app/assets/javascripts/discourse/controllers/poster-expansion.js.es6 b/app/assets/javascripts/discourse/controllers/user-expansion.js.es6
similarity index 100%
rename from app/assets/javascripts/discourse/controllers/poster-expansion.js.es6
rename to app/assets/javascripts/discourse/controllers/user-expansion.js.es6
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 2d15c1d45..cba09eb3e 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -13,7 +13,7 @@ var ApplicationRoute = Em.Route.extend({
     },
 
     expandUser: function(user) {
-      this.controllerFor('poster-expansion').show(user.get('username'), user.get('uploaded_avatar_id'));
+      this.controllerFor('user-expansion').show(user.get('username'), user.get('uploaded_avatar_id'));
       return true;
     },
 
diff --git a/app/assets/javascripts/discourse/routes/topic_route.js b/app/assets/javascripts/discourse/routes/topic_route.js
index 39d07763e..40a4758fc 100644
--- a/app/assets/javascripts/discourse/routes/topic_route.js
+++ b/app/assets/javascripts/discourse/routes/topic_route.js
@@ -15,13 +15,13 @@ Discourse.TopicRoute = Discourse.Route.extend({
   actions: {
     // Modals that can pop up within a topic
     expandPostUser: function(post) {
-      this.controllerFor('poster-expansion').show(post.get('username'), post.get('uploaded_avatar_id'));
+      this.controllerFor('user-expansion').show(post.get('username'), post.get('uploaded_avatar_id'));
     },
 
     expandPostUsername: function(username) {
       username = username.replace(/^@/, '');
       if (!Em.isEmpty(username)) {
-        this.controllerFor('poster-expansion').show(username);
+        this.controllerFor('user-expansion').show(username);
       }
     },
 
@@ -155,7 +155,7 @@ Discourse.TopicRoute = Discourse.Route.extend({
 
     // Clear the search context
     this.controllerFor('search').set('searchContext', null);
-    this.controllerFor('poster-expansion').set('visible', false);
+    this.controllerFor('user-expansion').set('visible', false);
 
     var topicController = this.controllerFor('topic'),
         postStream = topicController.get('postStream');
diff --git a/app/assets/javascripts/discourse/templates/application.js.handlebars b/app/assets/javascripts/discourse/templates/application.js.handlebars
index 0366dcbf8..75178ed4a 100644
--- a/app/assets/javascripts/discourse/templates/application.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/application.js.handlebars
@@ -2,7 +2,7 @@
 
 <div id='main-outlet' {{bind-attr class=backgroundClass}}>
   {{outlet}}
-  {{render "poster-expansion"}}
+  {{render "user-expansion"}}
 </div>
 
 {{render "modal"}}
diff --git a/app/assets/javascripts/discourse/templates/poster-expansion.js.handlebars b/app/assets/javascripts/discourse/templates/user-expansion.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/poster-expansion.js.handlebars
rename to app/assets/javascripts/discourse/templates/user-expansion.js.handlebars
diff --git a/app/assets/javascripts/discourse/views/popup_input_tip_view.js b/app/assets/javascripts/discourse/views/popup_input_tip_view.js
index 551d1cb97..a21d18629 100644
--- a/app/assets/javascripts/discourse/views/popup_input_tip_view.js
+++ b/app/assets/javascripts/discourse/views/popup_input_tip_view.js
@@ -56,4 +56,4 @@ Discourse.PopupInputTipView = Discourse.View.extend({
   }
 });
 
-Discourse.View.registerHelper('popupInputTip', Discourse.PopupInputTipView);
\ No newline at end of file
+Discourse.View.registerHelper('popupInputTip', Discourse.PopupInputTipView);
diff --git a/app/assets/javascripts/discourse/views/poster-expansion.js.es6 b/app/assets/javascripts/discourse/views/user-expansion.js.es6
similarity index 93%
rename from app/assets/javascripts/discourse/views/poster-expansion.js.es6
rename to app/assets/javascripts/discourse/views/user-expansion.js.es6
index ed9438891..186a0c4a6 100644
--- a/app/assets/javascripts/discourse/views/poster-expansion.js.es6
+++ b/app/assets/javascripts/discourse/views/user-expansion.js.es6
@@ -1,9 +1,9 @@
 import CleansUp from 'discourse/mixins/cleans-up';
 
-var clickOutsideEventName = "mousedown.outside-poster-expansion";
+var clickOutsideEventName = "mousedown.outside-user-expansion";
 
 export default Discourse.View.extend(CleansUp, {
-  elementId: 'poster-expansion',
+  elementId: 'user-expansion',
   classNameBindings: ['controller.visible::hidden', 'controller.showBadges'],
 
   _setup: function() {
diff --git a/app/assets/stylesheets/desktop/poster_expansion.scss b/app/assets/stylesheets/desktop/poster_expansion.scss
index c09ec34ff..96bfe6587 100644
--- a/app/assets/stylesheets/desktop/poster_expansion.scss
+++ b/app/assets/stylesheets/desktop/poster_expansion.scss
@@ -1,6 +1,6 @@
 // styles that apply to the "share" popup when sharing a link to a post or topic
 
-#poster-expansion {
+#user-expansion {
   position: absolute;
   width: 460px;
   left: 20px;
diff --git a/spec/phantom_js/smoke_test.js b/spec/phantom_js/smoke_test.js
index 5e65494e9..d41f697e1 100644
--- a/spec/phantom_js/smoke_test.js
+++ b/spec/phantom_js/smoke_test.js
@@ -126,7 +126,7 @@ page.runTests = function(){
   });
 
   test("has details",function(){
-    return $('#poster-expansion .names').length === 1;
+    return $('#user-expansion .names').length === 1;
   });
 
   run();