diff --git a/app/assets/javascripts/discourse/components/radio_button.js b/app/assets/javascripts/discourse/components/radio-button.js.es6
similarity index 65%
rename from app/assets/javascripts/discourse/components/radio_button.js
rename to app/assets/javascripts/discourse/components/radio-button.js.es6
index 1817064c94d..1a17c6bbe22 100644
--- a/app/assets/javascripts/discourse/components/radio_button.js
+++ b/app/assets/javascripts/discourse/components/radio-button.js.es6
@@ -1,4 +1,4 @@
-Discourse.RadioButton = Ember.Component.extend({
+export default Ember.Component.extend({
   tagName : "input",
   type : "radio",
   attributeBindings : [ "name", "type", "value", "checked:checked" ],
@@ -7,7 +7,5 @@ Discourse.RadioButton = Ember.Component.extend({
   },
   checked : function() {
     return this.get("value") === this.get("selection");
-  }.property('selection')
+  }.property('selection'),
 });
-
-Em.Handlebars.helper('radio-button', Discourse.RadioButton);
diff --git a/app/assets/javascripts/discourse/components/sortable_heading_component.js b/app/assets/javascripts/discourse/components/sortable-heading.js.es6
similarity index 92%
rename from app/assets/javascripts/discourse/components/sortable_heading_component.js
rename to app/assets/javascripts/discourse/components/sortable-heading.js.es6
index 1839bdc4408..c1f469ecc9e 100644
--- a/app/assets/javascripts/discourse/components/sortable_heading_component.js
+++ b/app/assets/javascripts/discourse/components/sortable-heading.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.SortableHeadingComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   tagName: 'th',
   classNameBindings: ['number:num', 'sortBy', 'iconSortClass:sorting', 'sortable:sortable'],
   attributeBindings: ['colspan'],
diff --git a/app/assets/javascripts/discourse/components/toggle_summary_component.js b/app/assets/javascripts/discourse/components/toggle-summary.js.es6
similarity index 87%
rename from app/assets/javascripts/discourse/components/toggle_summary_component.js
rename to app/assets/javascripts/discourse/components/toggle-summary.js.es6
index 2f97dd75efe..440cf8f0288 100644
--- a/app/assets/javascripts/discourse/components/toggle_summary_component.js
+++ b/app/assets/javascripts/discourse/components/toggle-summary.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.ToggleSummaryComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   layoutName: 'components/toggle-summary',
   tagName: 'section',
   classNames: ['information'],
diff --git a/app/assets/javascripts/discourse/components/topic_participant_component.js b/app/assets/javascripts/discourse/components/topic-participant.js.es6
similarity index 87%
rename from app/assets/javascripts/discourse/components/topic_participant_component.js
rename to app/assets/javascripts/discourse/components/topic-participant.js.es6
index 377f859d0a9..a710913753b 100644
--- a/app/assets/javascripts/discourse/components/topic_participant_component.js
+++ b/app/assets/javascripts/discourse/components/topic-participant.js.es6
@@ -1,4 +1,4 @@
-Discourse.TopicParticipantComponent = Ember.Component.extend({
+export default Ember.Component.extend({
 
   postStream: Em.computed.alias('participant.topic.postStream'),
 
diff --git a/app/assets/javascripts/discourse/components/topic_status_component.js b/app/assets/javascripts/discourse/components/topic-status.js.es6
similarity index 97%
rename from app/assets/javascripts/discourse/components/topic_status_component.js
rename to app/assets/javascripts/discourse/components/topic-status.js.es6
index d136673d419..af6779b4781 100644
--- a/app/assets/javascripts/discourse/components/topic_status_component.js
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.TopicStatusComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   classNames: ['topic-statuses'],
 
   hasDisplayableStatus: Em.computed.or('topic.archived','topic.closed', 'topic.pinned', 'topic.unpinned', 'topic.invisible', 'topic.archetypeObject.notDefault'),
diff --git a/app/assets/javascripts/discourse/components/user_badge_component.js b/app/assets/javascripts/discourse/components/user-badge.js.es6
similarity index 83%
rename from app/assets/javascripts/discourse/components/user_badge_component.js
rename to app/assets/javascripts/discourse/components/user-badge.js.es6
index 725169b2366..b4e97ecb0d1 100644
--- a/app/assets/javascripts/discourse/components/user_badge_component.js
+++ b/app/assets/javascripts/discourse/components/user-badge.js.es6
@@ -1,4 +1,4 @@
-Discourse.UserBadgeComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   tagName: 'span',
 
   badgeTypeClassName: function() {
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
index f628cd19d66..f5126ba1ab4 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
@@ -22,7 +22,7 @@
         {{#groupedEach topic in topics}}
           <tr {{bind-attr class="archived"}}>
             <td class='main-link'>
-              {{topicStatus topic=topic}}
+              {{topic-status topic=topic}}
               <a class='title' href="{{unbound topic.lastUnreadUrl}}">{{{unbound topic.fancy_title}}}</a>
               {{#if unread}}
                 <a href="{{unbound topic.lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound topic.unread}}</a>
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars
index 1bea0e56b9c..38b0e193530 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.js.handlebars
@@ -55,7 +55,7 @@
           <td {{bind-attr class="archived :latest"}}>
             {{#each featuredTopics}}
               <div class="featured-topic">
-                {{topicStatus topic=this}}
+                {{topic-status topic=this}}
                 <a class='title' href="{{unbound lastUnreadUrl}}">{{{unbound fancy_title}}}</a>
                 {{#if unread}}
                   <a href="{{unbound lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
diff --git a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
index d9c34110649..9fdb077a3c9 100644
--- a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
@@ -25,7 +25,7 @@
     <tr {{bind-attr class="archived"}}>
       <td class='main-link'>
         <div class='topic-inset'>
-          {{topicStatus topic=this}}
+          {{topic-status topic=this}}
           {{{topicLink this}}}
 
           {{#if unread}}
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 111fbfae2cb..f235a1c232f 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -18,7 +18,7 @@
           {{/if}}
           {{boundCategoryLink topic.category}}
           {{#if topic.details.loaded}}
-            {{topicStatus topic=topic}}
+            {{topic-status topic=topic}}
             <a class='topic-link' href='{{unbound topic.url}}' {{action jumpToTopPost}}>{{{topic.fancy_title}}}</a>
           {{else}}
             {{#if topic.errorLoading}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index 65c7898a874..9d97e6227c8 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -11,7 +11,7 @@
 {{/if}}
 
 <td class='main-link clearfix' {{bind-attr colspan="titleColSpan"}}>
-  {{topicStatus topic=this.model}}
+  {{topic-status topic=this.model}}
   {{{topicLink this}}}
   {{#if unread}}
     <a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
index c84bedb98cb..0f6ea29b4ce 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
@@ -5,7 +5,7 @@
         <tr {{bind-attr class="archived"}}>
           <td>
             <div class='main-link clearfix'>
-              {{topicStatus topic=this}}
+              {{topic-status topic=this}}
               {{{topicLink this}}}
               {{#if unread}}
                 <a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
index 841404cbef6..90559bda050 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
@@ -1,6 +1,6 @@
 <td>
 <div class='main-link clearfix'>
-  {{topicStatus topic=this}}
+  {{topic-status topic=this}}
   {{{topicLink this}}}
   {{#if unread}}
     <a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 35146649286..d70d5781e5e 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -32,7 +32,7 @@
               {{/if}}
               {{boundCategoryLink category}}
               {{#if details.loaded}}
-                {{topicStatus topic=model}}
+                {{topic-status topic=model}}
                 <a href='{{unbound url}}' {{action jumpTop}}>
                   {{#if topicSaving}}
                     {{fancy_title}}
diff --git a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
index 871c1f08ccb..a09cf1d6851 100644
--- a/app/assets/javascripts/discourse/views/topic-map-container.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
@@ -9,6 +9,7 @@
 **/
 import PrivateMessageMapComponent from 'discourse/components/private-message-map';
 import TopicMapComponent from 'discourse/components/topic-map';
+import ToggleSummaryComponent from 'discourse/components/toggle-summary';
 
 export default Discourse.ContainerView.extend({
   classNameBindings: ['hidden', ':topic-map'],
@@ -39,7 +40,7 @@ export default Discourse.ContainerView.extend({
       container.attachViewWithArgs({
         topic: topic,
         filterBinding: 'controller.filter'
-      }, Discourse.ToggleSummaryComponent);
+      }, ToggleSummaryComponent);
     }
 
     // If we have a private message