diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index e8c6a2af3..7f51291c4 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -117,7 +117,7 @@ export default Ember.DefaultResolver.extend({
 
   findUnderscoredTemplate: function(parsedName) {
     var decamelized = parsedName.fullNameWithoutType.decamelize();
-    var underscored = decamelized.replace("-", "_");
+    var underscored = decamelized.replace(/\-/g, "_");
     return Ember.TEMPLATES[underscored];
   },
 
diff --git a/app/assets/javascripts/discourse/templates/additional_composer_buttons.js.handlebars b/app/assets/javascripts/discourse/templates/additional-composer-buttons.js.handlebars
similarity index 84%
rename from app/assets/javascripts/discourse/templates/additional_composer_buttons.js.handlebars
rename to app/assets/javascripts/discourse/templates/additional-composer-buttons.js.handlebars
index 43ccd1b39..0a1a638f0 100644
--- a/app/assets/javascripts/discourse/templates/additional_composer_buttons.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/additional-composer-buttons.js.handlebars
@@ -1 +1,2 @@
 {{!-- THIS IS AN EMPTY TEMPLATE THAT NEEDS TO BE OVERWRITTEN --}}
+{{log wat}}
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index aff6e0d08..c1e05df66 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -58,7 +58,7 @@
               {{#if model.archetype.hasOptions}}
                 <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
-              {{render "additionalComposerButtons" model}}
+              {{render "additional-composer-buttons" model}}
             {{/unless}}
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars b/app/assets/javascripts/discourse/templates/topic-admin-menu.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars
rename to app/assets/javascripts/discourse/templates/topic-admin-menu.js.handlebars
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index fb3e66848..1ee57883c 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -153,5 +153,5 @@
 {{/if}}
 
 {{#if currentUser.canManageTopic}}
-  {{render "topicAdminMenu" content}}
+  {{render "topic-admin-menu" content}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars b/app/assets/javascripts/discourse/templates/user-dropdown.js.handlebars
similarity index 100%
rename from app/assets/javascripts/discourse/templates/user_dropdown.js.handlebars
rename to app/assets/javascripts/discourse/templates/user-dropdown.js.handlebars