diff --git a/app/assets/javascripts/discourse/controllers/upload_selector_controller.js b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
similarity index 67%
rename from app/assets/javascripts/discourse/controllers/upload_selector_controller.js
rename to app/assets/javascripts/discourse/controllers/upload-selector.js.es6
index c24a6251395..232e5531378 100644
--- a/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
+++ b/app/assets/javascripts/discourse/controllers/upload-selector.js.es6
@@ -7,7 +7,7 @@
   @uses Discourse.ModalFunctionality
   @module Discourse
 **/
-Discourse.UploadSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
+export default Discourse.Controller.extend(Discourse.ModalFunctionality, {
   remote: Em.computed.not("local"),
   local: false,
   showMore: false,
@@ -31,11 +31,3 @@ Discourse.UploadSelectorController = Discourse.Controller.extend(Discourse.Modal
   }
 
 });
-
-Discourse.UploadSelectorController.reopenClass({
-  translate: function(key, options) {
-    var opts = options || {};
-    if (Discourse.Utilities.allowsAttachments()) { key += "_with_attachments"; }
-    return I18n.t("upload_selector." + key, opts);
-  }
-});
diff --git a/app/assets/javascripts/discourse/controllers/user_activity_controller.js b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
similarity index 74%
rename from app/assets/javascripts/discourse/controllers/user_activity_controller.js
rename to app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 0b0cc3ab702..e8f2cef7c19 100644
--- a/app/assets/javascripts/discourse/controllers/user_activity_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -6,6 +6,6 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.UserActivityController = Discourse.ObjectController.extend({
+export default Discourse.ObjectController.extend({
   needs: ['composer']
 });
diff --git a/app/assets/javascripts/discourse/controllers/user_dropdown_controller.js b/app/assets/javascripts/discourse/controllers/user-dropdown.js.es6
similarity index 63%
rename from app/assets/javascripts/discourse/controllers/user_dropdown_controller.js
rename to app/assets/javascripts/discourse/controllers/user-dropdown.js.es6
index 4110dd01ce2..3413e61f276 100644
--- a/app/assets/javascripts/discourse/controllers/user_dropdown_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user-dropdown.js.es6
@@ -1,4 +1,4 @@
-Discourse.UserDropdownController = Ember.ArrayController.extend(Discourse.HasCurrentUser, {
+export default Ember.ArrayController.extend(Discourse.HasCurrentUser, {
   showAdminLinks: Em.computed.alias("currentUser.staff"),
 
   actions: {
diff --git a/app/assets/javascripts/discourse/controllers/user_invited_controller.js b/app/assets/javascripts/discourse/controllers/user-invited.js.es6
similarity index 96%
rename from app/assets/javascripts/discourse/controllers/user_invited_controller.js
rename to app/assets/javascripts/discourse/controllers/user-invited.js.es6
index dc0e82fa1de..6e63475a3a9 100644
--- a/app/assets/javascripts/discourse/controllers/user_invited_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user-invited.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.UserInvitedController = Ember.ObjectController.extend({
+export default Ember.ObjectController.extend({
   user: null,
 
   init: function() {
diff --git a/app/assets/javascripts/discourse/controllers/user_topics_list_controller.js b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
similarity index 80%
rename from app/assets/javascripts/discourse/controllers/user_topics_list_controller.js
rename to app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index 98be7c7b295..3de715bb428 100644
--- a/app/assets/javascripts/discourse/controllers/user_topics_list_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.UserTopicsListController = Discourse.ObjectController.extend({
+export default Discourse.ObjectController.extend({
   hideCategory: false,
   showParticipants: false,
 
diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js
index 15946f01be7..2c3e29e0396 100644
--- a/app/assets/javascripts/discourse/routes/application_route.js
+++ b/app/assets/javascripts/discourse/routes/application_route.js
@@ -39,7 +39,7 @@ Discourse.ApplicationRoute = Em.Route.extend({
 
     showUploadSelector: function(composerView) {
       Discourse.Route.showModal(this, 'uploadSelector');
-      this.controllerFor('uploadSelector').setProperties({ composerView: composerView });
+      this.controllerFor('upload-selector').setProperties({ composerView: composerView });
     },
 
     showKeyboardShortcutsHelp: function() {
diff --git a/app/assets/javascripts/discourse/routes/topic_route.js b/app/assets/javascripts/discourse/routes/topic_route.js
index 5f74ea772a6..4a8336bddb1 100644
--- a/app/assets/javascripts/discourse/routes/topic_route.js
+++ b/app/assets/javascripts/discourse/routes/topic_route.js
@@ -23,7 +23,7 @@ Discourse.TopicRoute = Discourse.Route.extend({
     composePrivateMessage: function(user) {
       var self = this;
       this.transitionTo('userActivity', user).then(function () {
-        self.controllerFor('userActivity').send('composePrivateMessage');
+        self.controllerFor('user-activity').send('composePrivateMessage');
       });
     },
 
diff --git a/app/assets/javascripts/discourse/routes/user_activity_route.js b/app/assets/javascripts/discourse/routes/user_activity_route.js
index d1c86b547ac..3e911d04b94 100644
--- a/app/assets/javascripts/discourse/routes/user_activity_route.js
+++ b/app/assets/javascripts/discourse/routes/user_activity_route.js
@@ -14,7 +14,7 @@ Discourse.UserActivityRoute = Discourse.Route.extend({
 
   setupController: function(controller, user) {
 
-    this.controllerFor('userActivity').set('model', user);
+    this.controllerFor('user-activity').set('model', user);
     this.controllerFor('user').set('pmView', null);
 
     // Bring up a draft
diff --git a/app/assets/javascripts/discourse/views/modal/upload_selector_view.js b/app/assets/javascripts/discourse/views/modal/upload_selector_view.js
index beaa410d89e..223dc3d467b 100644
--- a/app/assets/javascripts/discourse/views/modal/upload_selector_view.js
+++ b/app/assets/javascripts/discourse/views/modal/upload_selector_view.js
@@ -6,17 +6,24 @@
   @namespace Discourse
   @module Discourse
 **/
+
+function uploadTranslate(key, options) {
+  var opts = options || {};
+  if (Discourse.Utilities.allowsAttachments()) { key += "_with_attachments"; }
+  return I18n.t("upload_selector." + key, opts);
+}
+
 Discourse.UploadSelectorView = Discourse.ModalBodyView.extend({
   templateName: 'modal/upload_selector',
   classNames: ['upload-selector'],
 
-  title: function() { return Discourse.UploadSelectorController.translate("title"); }.property(),
+  title: function() { return uploadTranslate("title"); }.property(),
   uploadIcon: function() { return Discourse.Utilities.allowsAttachments() ? "fa-file-o" : "fa-picture-o"; }.property(),
 
   tip: function() {
     var source = this.get("controller.local") ? "local" : "remote";
     var opts = { authorized_extensions: Discourse.Utilities.authorizedExtensions() };
-    return Discourse.UploadSelectorController.translate(source + "_tip", opts);
+    return uploadTranslate(source + "_tip", opts);
   }.property("controller.local"),
 
   hint: function() {
diff --git a/test/javascripts/controllers/user_dropdown_controller_test.js b/test/javascripts/controllers/user_dropdown_controller_test.js
index 05855d00ed8..e1ef035b696 100644
--- a/test/javascripts/controllers/user_dropdown_controller_test.js
+++ b/test/javascripts/controllers/user_dropdown_controller_test.js
@@ -4,7 +4,7 @@ test("logout action logs out the current user", function () {
   var logout_mock = sinon.mock(Discourse, "logout");
   logout_mock.expects("logout").once();
 
-  var controller = Discourse.UserDropdownController.create();
+  var controller = controllerFor('user-dropdown');
   controller.send("logout");
 
   logout_mock.verify();
@@ -14,7 +14,7 @@ test("showAdminLinks", function() {
   var currentUserStub = Ember.Object.create();
   this.stub(Discourse.User, "current").returns(currentUserStub);
 
-  var controller = Discourse.UserDropdownController.create();
+  var controller = controllerFor('user-dropdown');
   currentUserStub.set("staff", true);
   equal(controller.get("showAdminLinks"), true, "is true when current user is a staff member");