diff --git a/app/assets/javascripts/discourse/components/post_gap_component.js b/app/assets/javascripts/discourse/components/post-gap.js.es6
similarity index 95%
rename from app/assets/javascripts/discourse/components/post_gap_component.js
rename to app/assets/javascripts/discourse/components/post-gap.js.es6
index 432619d785b..503448a1d66 100644
--- a/app/assets/javascripts/discourse/components/post_gap_component.js
+++ b/app/assets/javascripts/discourse/components/post-gap.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.PostGapComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   classNameBindings: [':gap', 'gap::hidden'],
 
   init: function() {
diff --git a/app/assets/javascripts/discourse/components/private_message_map_component.js b/app/assets/javascripts/discourse/components/private-message-map.js.es6
similarity index 89%
rename from app/assets/javascripts/discourse/components/private_message_map_component.js
rename to app/assets/javascripts/discourse/components/private-message-map.js.es6
index 403ee198173..22410fe4a84 100644
--- a/app/assets/javascripts/discourse/components/private_message_map_component.js
+++ b/app/assets/javascripts/discourse/components/private-message-map.js.es6
@@ -6,16 +6,12 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.PrivateMessageMapComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   layoutName: 'components/private-message-map',
   tagName: 'section',
   classNames: ['information'],
   details: Em.computed.alias('topic.details'),
 
-  init: function() {
-    this._super();
-  },
-
   actions: {
     removeAllowedUser: function(user) {
       var self = this;
diff --git a/app/assets/javascripts/discourse/components/topic_map_component.js b/app/assets/javascripts/discourse/components/topic-map.js.es6
similarity index 96%
rename from app/assets/javascripts/discourse/components/topic_map_component.js
rename to app/assets/javascripts/discourse/components/topic-map.js.es6
index 75e7d2e58fb..9096c05c5e0 100644
--- a/app/assets/javascripts/discourse/components/topic_map_component.js
+++ b/app/assets/javascripts/discourse/components/topic-map.js.es6
@@ -9,7 +9,7 @@
 
 var LINKS_SHOWN = 5;
 
-Discourse.TopicMapComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   mapCollapsed: true,
   layoutName: 'components/topic-map',
   details: Em.computed.alias('topic.details'),
diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index ae6eb38aebd..1a9c0f985ad 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -77,7 +77,7 @@
       </div>
       {{view Discourse.RepliesView content=replies postView=view}}
       {{discourse-action-history post=this}}
-      {{view Discourse.TopicMapContainerView post=this topic=controller.model}}
+      {{view 'topic-map-container' post=this topic=controller.model}}
     </div>
 
     {{post-gutter post=this
diff --git a/app/assets/javascripts/discourse/views/topic_map_container_view.js b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
similarity index 78%
rename from app/assets/javascripts/discourse/views/topic_map_container_view.js
rename to app/assets/javascripts/discourse/views/topic-map-container.js.es6
index 13dd85089b3..871c1f08ccb 100644
--- a/app/assets/javascripts/discourse/views/topic_map_container_view.js
+++ b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
@@ -7,7 +7,10 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.TopicMapContainerView = Discourse.ContainerView.extend({
+import PrivateMessageMapComponent from 'discourse/components/private-message-map';
+import TopicMapComponent from 'discourse/components/topic-map';
+
+export default Discourse.ContainerView.extend({
   classNameBindings: ['hidden', ':topic-map'],
   shouldRerender: Discourse.View.renderIfChanged('topic.posts_count'),
 
@@ -24,7 +27,7 @@ Discourse.TopicMapContainerView = Discourse.ContainerView.extend({
     this._super();
     if (this.get('hidden')) return;
 
-    this.attachViewWithArgs({ topic: this.get('topic') }, Discourse.TopicMapComponent);
+    this.attachViewWithArgs({ topic: this.get('topic') }, TopicMapComponent);
     this.trigger('appendMapInformation', this);
   },
 
@@ -41,7 +44,7 @@ Discourse.TopicMapContainerView = Discourse.ContainerView.extend({
 
     // If we have a private message
     if (this.get('topic.isPrivateMessage')) {
-      container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showPrivateInvite' }, Discourse.PrivateMessageMapComponent);
+      container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showPrivateInvite' }, PrivateMessageMapComponent);
     }
   }
 });