diff --git a/app/assets/javascripts/discourse/components/basic_topic_list_component.js b/app/assets/javascripts/discourse/components/basic_topic_list_component.js
index 1ff51a95db5..41aada403f0 100644
--- a/app/assets/javascripts/discourse/components/basic_topic_list_component.js
+++ b/app/assets/javascripts/discourse/components/basic_topic_list_component.js
@@ -1,12 +1,12 @@
 /**
   This view is used for rendering a basic list of topics.
 
-  @class BasicTopicListView
+  @class BasicTopicListComponent
   @extends Discourse.View
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseBasicTopicListComponent = Ember.Component.extend({
+Discourse.BasicTopicListComponent = Ember.Component.extend({
 
   loaded: function() {
     var topicList = this.get('topicList');
diff --git a/app/assets/javascripts/discourse/components/breadcrumbs_component.js b/app/assets/javascripts/discourse/components/bread_crumbs_component.js
similarity index 89%
rename from app/assets/javascripts/discourse/components/breadcrumbs_component.js
rename to app/assets/javascripts/discourse/components/bread_crumbs_component.js
index 1b10082d25d..ad9be3dad5e 100644
--- a/app/assets/javascripts/discourse/components/breadcrumbs_component.js
+++ b/app/assets/javascripts/discourse/components/bread_crumbs_component.js
@@ -1,12 +1,12 @@
 /**
   A breadcrumb including category drop downs
 
-  @class DiscourseBreadcrumbsComponent
+  @class BreadCrumbsComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseBreadcrumbsComponent = Ember.Component.extend({
+Discourse.BreadCrumbsComponent = Ember.Component.extend({
   classNames: ['category-breadcrumb'],
   tagName: 'ol',
   parentCategory: Em.computed.alias('category.parentCategory'),
diff --git a/app/assets/javascripts/discourse/components/categorydrop_component.js b/app/assets/javascripts/discourse/components/categorydrop_component.js
index 20c077536ed..c0ef103cf8a 100644
--- a/app/assets/javascripts/discourse/components/categorydrop_component.js
+++ b/app/assets/javascripts/discourse/components/categorydrop_component.js
@@ -1,12 +1,12 @@
 /**
   Renders a drop down for selecting a category
 
-  @class DiscourseCategorydropComponent
+  @class CategoryDropComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseCategorydropComponent = Ember.Component.extend({
+Discourse.CategoryDropComponent = Ember.Component.extend({
   classNameBindings: ['category::no-category', 'categories:has-drop'],
   tagName: 'li',
 
diff --git a/app/assets/javascripts/discourse/components/logo_component.js b/app/assets/javascripts/discourse/components/home_logo_component.js
similarity index 88%
rename from app/assets/javascripts/discourse/components/logo_component.js
rename to app/assets/javascripts/discourse/components/home_logo_component.js
index 443d666a2fa..a693e63feef 100644
--- a/app/assets/javascripts/discourse/components/logo_component.js
+++ b/app/assets/javascripts/discourse/components/home_logo_component.js
@@ -1,4 +1,4 @@
-Discourse.DiscourseLogoComponent = Ember.Component.extend({
+Discourse.HomeLogoComponent = Ember.Component.extend({
 
   linkUrl: function() {
     return Discourse.getURL("/");
diff --git a/app/assets/javascripts/discourse/components/private_message_map_component.js b/app/assets/javascripts/discourse/components/private_message_map_component.js
index b1e734ee469..fc87446aff4 100644
--- a/app/assets/javascripts/discourse/components/private_message_map_component.js
+++ b/app/assets/javascripts/discourse/components/private_message_map_component.js
@@ -1,13 +1,13 @@
 /**
   The controls at the top of a private message in the map area.
 
-  @class DiscoursePrivateMessageMapComponent
+  @class PrivateMessageMapComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscoursePrivateMessageMapComponent = Ember.Component.extend({
-  templateName: 'components/discourse-private-message-map',
+Discourse.PrivateMessageMapComponent = Ember.Component.extend({
+  templateName: 'components/private-message-map',
   tagName: 'section',
   classNames: ['information'],
   postStream: Em.computed.alias('topic.postStream'),
diff --git a/app/assets/javascripts/discourse/components/heading_component.js b/app/assets/javascripts/discourse/components/sortable_heading_component.js
similarity index 90%
rename from app/assets/javascripts/discourse/components/heading_component.js
rename to app/assets/javascripts/discourse/components/sortable_heading_component.js
index 3ec8d1b7f17..f3a073f4e1b 100644
--- a/app/assets/javascripts/discourse/components/heading_component.js
+++ b/app/assets/javascripts/discourse/components/sortable_heading_component.js
@@ -1,12 +1,12 @@
 /**
   Renders a heading for a table with optional sorting controls.
 
-  @class DiscourseHeadingComponent
+  @class SortableHeadingComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseHeadingComponent = Ember.Component.extend({
+Discourse.SortableHeadingComponent = 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_component.js
index a7e34b7624c..66f3d8c697d 100644
--- a/app/assets/javascripts/discourse/components/toggle_summary_component.js
+++ b/app/assets/javascripts/discourse/components/toggle_summary_component.js
@@ -1,13 +1,13 @@
 /**
   The controls for toggling the summarized view on/off
 
-  @class DiscourseToggleSummaryComponent
+  @class ToggleSummaryComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseToggleSummaryComponent = Ember.Component.extend({
-  templateName: 'components/discourse-toggle-summary',
+Discourse.ToggleSummaryComponent = Ember.Component.extend({
+  templateName: 'components/toggle-summary',
   tagName: 'section',
   classNames: ['information'],
   postStream: Em.computed.alias('topic.postStream'),
diff --git a/app/assets/javascripts/discourse/components/topic_map_component.js b/app/assets/javascripts/discourse/components/topic_map_component.js
index 394f5c61789..e1feb41b10d 100644
--- a/app/assets/javascripts/discourse/components/topic_map_component.js
+++ b/app/assets/javascripts/discourse/components/topic_map_component.js
@@ -11,7 +11,7 @@ var LINKS_SHOWN = 5;
 
 Discourse.DiscourseTopicMapComponent = Ember.Component.extend({
   mapCollapsed: true,
-  templateName: 'components/discourse-topic-map',
+  templateName: 'components/topic-map',
   details: Em.computed.alias('topic.details'),
   allLinksShown: false,
 
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
similarity index 81%
rename from app/assets/javascripts/discourse/templates/components/discourse-basic-topic-list.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
index 454bd4f5415..4d68605444b 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-basic-topic-list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
@@ -2,24 +2,24 @@
   {{#if topics}}
     <table id="topic-list">
       <tr>
-        {{#discourse-heading sortBy="default" sortOrder=sortOrder}}
+        {{#sortable-heading sortBy="default" sortOrder=sortOrder}}
           {{i18n topic.title}}
-        {{/discourse-heading}}
-        {{#discourse-heading sortBy="category" sortOrder=sortOrder}}
+        {{/sortable-heading}}
+        {{#sortable-heading sortBy="category" sortOrder=sortOrder}}
           {{i18n category_title}}
-        {{/discourse-heading}}
-        {{#discourse-heading sortBy="posts" number=true sortOrder=sortOrder}}
+        {{/sortable-heading}}
+        {{#sortable-heading sortBy="posts" number=true sortOrder=sortOrder}}
           {{i18n posts}}
-        {{/discourse-heading}}
-        {{#discourse-heading sortBy="likes" number=true sortOrder=sortOrder}}
+        {{/sortable-heading}}
+        {{#sortable-heading sortBy="likes" number=true sortOrder=sortOrder}}
           {{i18n likes}}
-        {{/discourse-heading}}
-        {{#discourse-heading sortBy="views" number=true sortOrder=sortOrder}}
+        {{/sortable-heading}}
+        {{#sortable-heading sortBy="views" number=true sortOrder=sortOrder}}
           {{i18n views}}
-        {{/discourse-heading}}
-        {{#discourse-heading sortBy="activity" number=true colspan="2" sortOrder=sortOrder}}
+        {{/sortable-heading}}
+        {{#sortable-heading sortBy="activity" number=true colspan="2" sortOrder=sortOrder}}
           {{i18n activity}}
-        {{/discourse-heading}}
+        {{/sortable-heading}}
       </tr>
 
       {{#groupedEach topic in topics}}
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.js.handlebars b/app/assets/javascripts/discourse/templates/components/bread-crumbs.js.handlebars
new file mode 100644
index 00000000000..9804739fb02
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.js.handlebars
@@ -0,0 +1,11 @@
+<li>
+{{category-drop category=firstCategory categories=parentCategories}}
+</li>
+
+{{#if childCategories}}
+  <li>
+    {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true"}}
+  </li>
+{{/if}}
+
+<div class='clear'></div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars b/app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-categorydrop.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/category-drop.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars b/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars
deleted file mode 100644
index 6a9968dd014..00000000000
--- a/app/assets/javascripts/discourse/templates/components/discourse-breadcrumbs.js.handlebars
+++ /dev/null
@@ -1,11 +0,0 @@
-<li>
-{{discourse-categorydrop category=firstCategory categories=parentCategories}}
-</li>
-
-{{#if childCategories}}
-  <li>
-    {{discourse-categorydrop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true"}}
-  </li>
-{{/if}}
-
-<div class='clear'></div>
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-header-category-info.js.handlebars b/app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-header-category-info.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/header-category-info.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-logo.js.handlebars b/app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-logo.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/home-logo.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-private-message-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/private-message-map.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-private-message-map.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/private-message-map.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-heading.js.handlebars b/app/assets/javascripts/discourse/templates/components/sortable-heading.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-heading.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/sortable-heading.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-toggle-summary.js.handlebars b/app/assets/javascripts/discourse/templates/components/toggle-summary.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-toggle-summary.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/toggle-summary.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-topic-list-loading.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-list-loading.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-topic-list-loading.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/topic-list-loading.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-topic-map.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
similarity index 89%
rename from app/assets/javascripts/discourse/templates/components/discourse-topic-map.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
index e7a2f917c17..4fb64ede697 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-topic-map.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.js.handlebars
@@ -41,14 +41,14 @@
       {{number details.links.length}}
     </li>
     <li {{bindAttr class=":avatars mapCollapsed::hidden"}}>
-      {{#groupedEach participant in details.fewParticipants}}{{discourse-topic-participant participant=participant}}{{/groupedEach}}
+      {{#groupedEach participant in details.fewParticipants}}{{topic-participant participant=participant}}{{/groupedEach}}
     </li>
   </ul>
 </section>
 
 {{#unless mapCollapsed}}
   <section class='avatars clearfix'>
-    {{#groupedEach participant in details.participants}}{{discourse-topic-participant participant=participant}}{{/groupedEach}}
+    {{#groupedEach participant in details.participants}}{{topic-participant participant=participant}}{{/groupedEach}}
   </section>
 
   {{#if infoLinks}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-topic-participant.js.handlebars b/app/assets/javascripts/discourse/templates/components/topic-participant.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/discourse-topic-participant.js.handlebars
rename to app/assets/javascripts/discourse/templates/components/topic-participant.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 7971f9d76af..b531fafa7c9 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -1,7 +1,7 @@
 <div class='container'>
   <div class='contents clearfix'>
 
-    {{discourse-logo minimized=showExtraInfo}}
+    {{home-logo minimized=showExtraInfo}}
 
     {{#if showExtraInfo}}
       <div class="extra-info-wrapper">
@@ -133,7 +133,7 @@
 
           {{#each categories}}
             <li class='category'>
-              {{discourse-header-category-info category=this currentUser=controller.currentUser}}
+              {{header-category-info category=this currentUser=controller.currentUser}}
             </li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/discourse/templates/list.js.handlebars b/app/assets/javascripts/discourse/templates/list.js.handlebars
index 30f8b6353c3..54eb00209b9 100644
--- a/app/assets/javascripts/discourse/templates/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list.js.handlebars
@@ -3,7 +3,7 @@
 <div class='list-controls'>
   <div class="container">
 
-    {{discourse-breadcrumbs category=category categories=categories}}
+    {{bread-crumbs category=category categories=categories}}
 
     <ul class="nav nav-pills" id='category-filter'>
       {{each availableNavItems itemViewClass="Discourse.NavItemView"}}
@@ -28,7 +28,7 @@
   <div class="row">
     <div class="full-width">
       <div id='list-area'>
-        {{discourse-topic-list-loading loading=loading}}
+        {{topic-list-loading loading=loading}}
         {{outlet listView}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
index 961cdc94d12..134bcb33cff 100644
--- a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
@@ -1,4 +1,4 @@
-{{discourse-topic-list-loading loading=topicListReloading}}
+{{topic-list-loading loading=topicListReloading}}
 
 {{#unless loading}}
   {{#if loaded}}
@@ -18,29 +18,29 @@
           {{#if currentUser}}
             <th>&nbsp;</th>
           {{/if}}
-          {{#discourse-heading sortBy="default" sortOrder=sortOrder}}
+          {{#sortable-heading sortBy="default" sortOrder=sortOrder}}
             {{i18n topic.title}}
-          {{/discourse-heading}}
+          {{/sortable-heading}}
           {{#unless category}}
-            {{#discourse-heading sortBy="category" sortOrder=sortOrder}}
+            {{#sortable-heading sortBy="category" sortOrder=sortOrder}}
               {{i18n category_title}}
-            {{/discourse-heading}}
+            {{/sortable-heading}}
           {{/unless}}
-          {{#discourse-heading sortBy="posters" sortOrder=sortOrder}}
+          {{#sortable-heading sortBy="posters" sortOrder=sortOrder}}
             {{i18n participants}}
-          {{/discourse-heading}}
-          {{#discourse-heading sortBy="posts" number=true sortOrder=sortOrder}}
+          {{/sortable-heading}}
+          {{#sortable-heading sortBy="posts" number=true sortOrder=sortOrder}}
             {{i18n posts}}
-          {{/discourse-heading}}
-          {{#discourse-heading sortBy="likes" number=true sortOrder=sortOrder}}
+          {{/sortable-heading}}
+          {{#sortable-heading sortBy="likes" number=true sortOrder=sortOrder}}
             {{i18n likes}}
-          {{/discourse-heading}}
-          {{#discourse-heading sortBy="views" number=true sortOrder=sortOrder}}
+          {{/sortable-heading}}
+          {{#sortable-heading sortBy="views" number=true sortOrder=sortOrder}}
             {{i18n views}}
-          {{/discourse-heading}}
-          {{#discourse-heading sortBy="activity" number=true colspan="2" sortOrder=sortOrder}}
+          {{/sortable-heading}}
+          {{#sortable-heading sortBy="activity" number=true colspan="2" sortOrder=sortOrder}}
             {{i18n activity}}
-          {{/discourse-heading}}
+          {{/sortable-heading}}
         </tr>
         </thead>
 
diff --git a/app/assets/javascripts/discourse/templates/list/user_topics_list.js.handlebars b/app/assets/javascripts/discourse/templates/list/user_topics_list.js.handlebars
index 7eb83d9574e..e7a7e4e3f6d 100644
--- a/app/assets/javascripts/discourse/templates/list/user_topics_list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/user_topics_list.js.handlebars
@@ -1 +1 @@
-{{discourse-basic-topic-list topicList=model}}
+{{basic-topic-list topicList=model}}
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 6d6fb7013ce..e9fd76a1a31 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -85,7 +85,7 @@
               <div id='suggested-topics'>
                 <h3>{{i18n suggested_topics.title}}</h3>
                 <div class='topics'>
-                  {{discourse-basic-topic-list topics=details.suggested_topics}}
+                  {{basic-topic-list topics=details.suggested_topics}}
                 </div>
                 <br/>
                 <h3>{{{view.browseMoreMessage}}}</h3>
diff --git a/test/javascripts/components/logo_component_test.js b/test/javascripts/components/logo_component_test.js
index 2efa46dc73a..6c912895878 100644
--- a/test/javascripts/components/logo_component_test.js
+++ b/test/javascripts/components/logo_component_test.js
@@ -1,7 +1,7 @@
 var view, oldMobileView;
 
 var View = Ember.View.extend({
-  template: Ember.Handlebars.compile("{{discourse-logo minimized=view.minimized}}")
+  template: Ember.Handlebars.compile("{{home-logo minimized=view.minimized}}")
 });
 
 
@@ -43,7 +43,7 @@ var appendView = function() {
 };
 
 
-module("Discourse.DiscourseLogoComponent", {
+module("Discourse.HomeLogoComponent", {
   setup: function() {
     oldMobileView = Discourse.Mobile.mobileView;
     view = View.create();