diff --git a/app/assets/javascripts/discourse/components/topic_map_component.js b/app/assets/javascripts/discourse/components/topic_map_component.js
index e1feb41b1..6b835d975 100644
--- a/app/assets/javascripts/discourse/components/topic_map_component.js
+++ b/app/assets/javascripts/discourse/components/topic_map_component.js
@@ -1,7 +1,7 @@
 /**
   The topic map underneath the first post of a topic.
 
-  @class DiscourseTopicMapComponent
+  @class TopicMapComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
@@ -9,7 +9,7 @@
 
 var LINKS_SHOWN = 5;
 
-Discourse.DiscourseTopicMapComponent = Ember.Component.extend({
+Discourse.TopicMapComponent = Ember.Component.extend({
   mapCollapsed: true,
   templateName: 'components/topic-map',
   details: Em.computed.alias('topic.details'),
diff --git a/app/assets/javascripts/discourse/views/topic_map_container_view.js b/app/assets/javascripts/discourse/views/topic_map_container_view.js
index 686959c60..48a48e201 100644
--- a/app/assets/javascripts/discourse/views/topic_map_container_view.js
+++ b/app/assets/javascripts/discourse/views/topic_map_container_view.js
@@ -24,7 +24,7 @@ Discourse.TopicMapContainerView = Discourse.ContainerView.extend({
     this._super();
     if (this.get('hidden')) return;
 
-    this.attachViewWithArgs({ topic: this.get('topic') }, Discourse.DiscourseTopicMapComponent);
+    this.attachViewWithArgs({ topic: this.get('topic') }, Discourse.TopicMapComponent);
     this.trigger('appendMapInformation', this);
   },
 
@@ -33,12 +33,12 @@ Discourse.TopicMapContainerView = Discourse.ContainerView.extend({
 
     // If we have a summary capability
     if (topic.get('has_summary')) {
-      container.attachViewWithArgs({ topic: topic }, Discourse.DiscourseToggleSummaryComponent);
+      container.attachViewWithArgs({ topic: topic }, Discourse.ToggleSummaryComponent);
     }
 
     // If we have a private message
     if (this.get('topic.isPrivateMessage')) {
-      container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showPrivateInvite' }, Discourse.DiscoursePrivateMessageMapComponent);
+      container.attachViewWithArgs({ topic: topic, showPrivateInviteAction: 'showPrivateInvite' }, Discourse.PrivateMessageMapComponent);
     }
   }
 });