diff --git a/app/assets/javascripts/discourse/templates/application.js.handlebars b/app/assets/javascripts/discourse/templates/application.js.handlebars
index e6de6789884..43e5273bd0d 100644
--- a/app/assets/javascripts/discourse/templates/application.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/application.js.handlebars
@@ -1,7 +1,7 @@
-{{render header}}
+{{render "header"}}
 
 <div id='main-outlet'>
   {{outlet}}
 </div>
 
-{{render modal}}
+{{render "modal"}}
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index fffd0fed859..7570252f5cc 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -2,7 +2,7 @@
 
 <div class='contents'>
 
-  {{render composerMessages}}
+  {{render "composerMessages"}}
 
   <div class='control'>
     <a href='#' class='toggler' {{action toggle bubbles=false}} title='{{i18n composer.toggler}}'></a>
@@ -48,7 +48,7 @@
               {{#if model.archetype.hasOptions}}
                 <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
-              {{render additionalComposerButtons model}}
+              {{render "additionalComposerButtons" model}}
             {{/unless}}
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index 66a13360fc1..f8330462eda 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -108,15 +108,15 @@
         </li>
       </ul>
 
-      {{render search}}
+      {{render "search"}}
 
-      {{render notifications notifications}}
+      {{render "notifications" notifications}}
 
       {{#if view.renderSiteMap}}
-        {{render siteMap}}
+        {{render "siteMap"}}
       {{/if}}
 
-      {{ render userDropdown }}
+      {{render "userDropdown"}}
 
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.js.handlebars b/app/assets/javascripts/discourse/templates/topic.js.handlebars
index 203cc6f3215..5878b884a3f 100644
--- a/app/assets/javascripts/discourse/templates/topic.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic.js.handlebars
@@ -142,15 +142,15 @@
   {{/if}}
 {{/if}}
 
-{{render share}}
-{{render posterExpansion}}
+{{render "share"}}
+{{render "posterExpansion"}}
 
 {{#if currentUser.enable_quoting}}
-  {{render quoteButton}}
+  {{render "quoteButton"}}
 {{/if}}
 
 {{#if currentUser.canManageTopic}}
-  {{render topicAdminMenu content}}
+  {{render "topicAdminMenu" content}}
 {{/if}}
 
 {{customHTML "bottom"}}