diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index 8ee7f0f99d9..5b241553786 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -16,7 +16,7 @@
     {{else}}
       <br>
       {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}}
-      <button class='btn btn-primary' {{action grantBadge controller.selectedBadgeId}}>{{i18n admin.badges.grant}}</button>
+      <button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n admin.badges.grant}}</button>
     {{/if}}
 
     <br>
@@ -44,7 +44,7 @@
           </td>
           <td>{{age-with-tooltip granted_at}}</td>
           <td>
-            <button class='btn' {{action revokeBadge this}}>{{i18n admin.badges.revoke}}</button>
+            <button class='btn' {{action "revokeBadge" this}}>{{i18n admin.badges.revoke}}</button>
           </td>
         </tr>
       {{else}}
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs
index d37213e9237..d3cc12b2ad7 100644
--- a/app/assets/javascripts/admin/templates/users_list.hbs
+++ b/app/assets/javascripts/admin/templates/users_list.hbs
@@ -16,15 +16,15 @@
     {{text-field value=username placeholderKey="search_hint"}}
   </div>
   <div class="pull-right">
-    <button {{action exportUsers}} class="btn" title="{{i18n admin.export_csv.users.title}}"><i class="fa fa-download"></i>{{i18n admin.export_csv.users.text}}</button>
+    <button {{action "exportUsers"}} class="btn" title="{{i18n admin.export_csv.users.title}}"><i class="fa fa-download"></i>{{i18n admin.export_csv.users.text}}</button>
   </div>
 </div>
 
 <div class="admin-container">
   {{#if hasSelection}}
     <div id='selected-controls'>
-      <button {{action approveUsers}} class='btn'>{{countI18n admin.users.approved_selected countBinding="selectedCount"}}</button>
-      <button {{action rejectUsers}}  class='btn btn-danger'>{{countI18n admin.users.reject_selected countBinding="selectedCount"}}</button>
+      <button {{action "approveUsers"}} class='btn'>{{countI18n admin.users.approved_selected countBinding="selectedCount"}}</button>
+      <button {{action "rejectUsers"}}  class='btn btn-danger'>{{countI18n admin.users.reject_selected countBinding="selectedCount"}}</button>
     </div>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/components/private-message-map.js.es6 b/app/assets/javascripts/discourse/components/private-message-map.js.es6
index 22410fe4a84..f8d402ba760 100644
--- a/app/assets/javascripts/discourse/components/private-message-map.js.es6
+++ b/app/assets/javascripts/discourse/components/private-message-map.js.es6
@@ -1,11 +1,3 @@
-/**
-  The controls at the top of a private message in the map area.
-
-  @class PrivateMessageMapComponent
-  @extends Ember.Component
-  @namespace Discourse
-  @module Discourse
-**/
 export default Ember.Component.extend({
   layoutName: 'components/private-message-map',
   tagName: 'section',
diff --git a/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs b/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs
index 22d91f0f728..a8610862d29 100644
--- a/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/category_notification_dropdown.hbs
@@ -8,7 +8,7 @@
 <ul class='notification-dropdown-menu'>
   {{#each level in view.dropDownContent}}
     <li data-id="{{level.id}}">
-      <a {{action setNotification level.id}} href="#">
+      <a {{action "setNotification" level.id}} href="#">
         <span class="title"><i {{bind-attr class=level.styleClasses}}></i>&nbsp;{{level.title}}</span><span>{{level.description}}</span>
       </a>
     </li>
diff --git a/app/assets/javascripts/discourse/templates/choose_topic.hbs b/app/assets/javascripts/discourse/templates/choose_topic.hbs
index 8da43485957..c06bca4cc54 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/choose_topic.hbs
@@ -11,7 +11,7 @@
     {{#each view.topics}}
       <div class='controls'>
         <label class='radio'>
-        <input type='radio' id="choose-topic-{{unbound id}}" name='choose_topic_id' {{action chooseTopic this target="view"}}>{{title}}
+        <input type='radio' id="choose-topic-{{unbound id}}" name='choose_topic_id' {{action "chooseTopic" this target="view"}}>{{title}}
         {{#if category.parentCategory}}
           {{bound-category-link category.parentCategory}}
         {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 287071b98f2..80c9517a180 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,5 +1,5 @@
 <input type="file" accept="image/*" style="display:none" />
-<button class="btn" {{action selectFile}} {{bind-attr disabled="uploading"}} title="{{i18n user.change_avatar.upload_title}}">
+<button class="btn" {{action "selectFile"}} {{bind-attr disabled="uploading"}} title="{{i18n user.change_avatar.upload_title}}">
   <i class="fa fa-picture-o"></i>&nbsp;{{uploadButtonText}}
 </button>
 {{#if uploading}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index 7e56dd5a3bb..1123fa6befb 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -1,5 +1,5 @@
 {{#if category}}
-  <a href="#" {{action expand}} class="badge-category" {{bind-attr style="badgeStyle"}}>
+  <a href="#" {{action "expand"}} class="badge-category" {{bind-attr style="badgeStyle"}}>
     {{#if category.read_restricted}}
       <i class='fa fa-group'></i>
     {{/if}}
@@ -7,14 +7,14 @@
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</a>
+    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</a>
   {{else}}
-    <a href='#' {{action expand}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
+    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
   {{/if}}
 {{/if}}
 
 {{#if categories}}
-  <a href='#' {{action expand}} {{bind-attr class="dropdownButtonClass" style="badgeStyle"}}><i {{bind-attr class="iconClass"}}></i></a>
+  <a href='#' {{action "expand"}} {{bind-attr class="dropdownButtonClass" style="badgeStyle"}}><i {{bind-attr class="iconClass"}}></i></a>
   <section {{bind-attr class="expanded::hidden :category-dropdown-menu"}} class='chooser'>
     <div class='cat'><a {{bind-attr href=allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#if subCategory}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index 98881823318..0c6c945640a 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -2,7 +2,7 @@
   <div class="row">
     <div id="banner" {{bind-attr class="overlay"}}>
       <div id="banner-content">
-        <div class="close" {{action dismiss}}><i class="fa fa-times" title="{{i18n banner.close}}"></i></div>
+        <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n banner.close}}"></i></div>
         {{{banner.html}}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
index ec004d318ba..4aeb37702a1 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action select}}>{{title}}</a>
+<a href {{action "select"}}>{{title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 9f492495ab2..67ba6ca3e21 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -1,9 +1,9 @@
 <input type="file" accept="image/*" style="display:none" />
 <div class="uploaded-image-preview" class="input-xxlarge" {{bind-attr style="backgroundStyle"}}>
   <div class="image-upload-controls">
-  <button {{action selectFile}} class="btn pad-left no-text"><i class="fa fa-picture-o"></i></button>
+  <button {{action "selectFile"}} class="btn pad-left no-text"><i class="fa fa-picture-o"></i></button>
   {{#if backgroundStyle}}
-    <button {{action trash}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button>
+    <button {{action "trash"}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button>
   {{/if}}
   <span {{bind-attr class=":btn uploading::hidden"}}>{{i18n upload_selector.uploading}} {{uploadProgress}}%</span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index b2058dea6fb..ba9c9d28df2 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,5 +1,5 @@
 {{#if ip}}
-  <button class="btn" {{action lookup}}>
+  <button class="btn" {{action "lookup"}}>
     <span class="fa fa-globe"></span>&nbsp;{{i18n admin.user.ip_lookup}}
   </button>
 {{/if}}
@@ -49,6 +49,6 @@
         {{/if}}
       <dd>
     </dl>
-    <button class="btn close" {{action hide}}>{{i18n close}}</button>
+    <button class="btn close" {{action "hide"}}>{{i18n close}}</button>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
index e5aabe80624..a474886436a 100644
--- a/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/components/login-buttons.hbs
@@ -1,3 +1,3 @@
 {{#each buttons}}
-  <button {{bind-attr class=":btn :btn-social name"}} {{action externalLogin this}}>{{title}}</button>
+  <button {{bind-attr class=":btn :btn-social name"}} {{action "externalLogin" this}}>{{title}}</button>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
index f238ba7b080..6b1dd73e7ba 100644
--- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
@@ -14,13 +14,13 @@
         {{unbound username}}
       {{/link-to}}
       {{#if details.can_remove_allowed_users}}
-        <a class='remove-invited' {{action removeAllowedUser this}}><i class="fa fa-times"></i></a>
+        <a class='remove-invited' {{action "removeAllowedUser" this}}><i class="fa fa-times"></i></a>
       {{/if}}
     </div>
   {{/grouped-each}}
 </div>
 {{#if details.can_invite_to}}
   <div class='controls'>
-    <button class='btn' {{action showPrivateInvite}}>{{i18n private_message_info.invite}}</button>
+    <button class='btn' {{action "showPrivateInvite"}}>{{i18n private_message_info.invite}}</button>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
index 234bb506fd1..6b497d6ab5a 100644
--- a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
 <b>{{i18n admin.logs.screened_ips.form.label}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 {{combo-box content=actionNames value=actionName}}
-<button class="btn btn-small" {{action submit target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n admin.logs.screened_ips.form.add}}</button>
+<button class="btn btn-small" {{action "submit" target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n admin.logs.screened_ips.form.add}}</button>
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
index c4c3497c6fe..c6b6d21c399 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
@@ -1,7 +1,7 @@
 {{#if postStream.show_deleted}}
   <p>{{i18n deleted_filter.disabled_description}}</p>
-  <button class='btn btn-danger' {{action toggleDeleted}}>{{i18n deleted_filter.enable}}</button>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.enable}}</button>
 {{else}}
   <p>{{i18n deleted_filter.enabled_description}}</p>
-  <button class='btn btn-danger' {{action toggleDeleted}}>{{i18n deleted_filter.disable}}</button>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.disable}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
index 9f52cad8f27..bfc26874f5b 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
@@ -1,6 +1,6 @@
 {{#if postStream.summary}}
   <p>{{{i18n summary.enabled_description}}}</p>
-  <button class='btn btn-primary' {{action toggleSummary}}>{{i18n summary.disable}}</button>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.disable}}</button>
 {{else}}
   {{#if topic.estimatedReadingTime}}
     <p>{{{i18n summary.description_time count="topic.posts_count" readingTime="topic.estimatedReadingTime"}}}</p>
@@ -8,5 +8,5 @@
     <p>{{{i18n summary.description count="topic.posts_count"}}}</p>
   {{/if}}
 
-  <button class='btn btn-primary' {{action toggleSummary}}>{{i18n summary.enable}}</button>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.enable}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index dd4bc2a06b1..2ee9ad3a11f 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -1,5 +1,5 @@
 <nav class='buttons'>
-  <button class='btn' {{action toggleMap}} title="{{i18n topic.toggle_information}}">
+  <button class='btn' {{action "toggleMap"}} title="{{i18n topic.toggle_information}}">
     <i {{bind-attr class=":fa toggleMapClass"}}></i>
   </button>
 </nav>
@@ -78,7 +78,7 @@
 
         {{#if showAllLinksControls}}
           <div class='link-summary'>
-            <a href='#' {{action showAllLinks}}>{{i18n topic_map.links_shown totalLinks="details.links.length"}}</a>
+            <a href='#' {{action "showAllLinks"}}>{{i18n topic_map.links_shown totalLinks="details.links.length"}}</a>
           </div>
         {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs
index 344539d0a84..8233edb58ae 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-participant.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-participant.hbs
@@ -1,4 +1,4 @@
-<a href='#' {{bind-attr class=":poster toggled"}} {{action toggle}} title="{{unbound participant.username}}">
+<a href='#' {{bind-attr class=":poster toggled"}} {{action "toggle"}} title="{{unbound participant.username}}">
   {{#if showPostCount}}
     <span class='post-count'>{{unbound participant.post_count}}</span>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/education.hbs b/app/assets/javascripts/discourse/templates/composer/education.hbs
index a4f045a133c..bb818e700ef 100644
--- a/app/assets/javascripts/discourse/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href='#' {{action closeMessage this}} class='close'><i class='fa fa-times-circle'></i></a>
+<a href='#' {{action "closeMessage" this}} class='close'><i class='fa fa-times-circle'></i></a>
 {{{body}}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
index a3b75275ec0..9f8776c21f2 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
@@ -1,4 +1,4 @@
-<a href='#' {{action closeMessage this}} class='close'><i class='fa fa-times-circle'></i></a>
+<a href='#' {{action "closeMessage" this}} class='close'><i class='fa fa-times-circle'></i></a>
 <h3>{{i18n composer.similar_topics}}</h3>
 
 <ul class='topics'>
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.hbs b/app/assets/javascripts/discourse/templates/list/topic_list_item.hbs
index 58e4e7602f4..4a52efa706f 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.hbs
@@ -5,7 +5,7 @@
 {{else}}
   {{#if canStar}}
     <td class='star'>
-      <a {{bind-attr class=":star :fa :fa-star starred:starred"}} {{action toggleStar}} href='#' {{bind-attr title="starTooltip"}}></a>
+      <a {{bind-attr class=":star :fa :fa-star starred:starred"}} {{action "toggleStar"}} href='#' {{bind-attr title="starTooltip"}}></a>
     </td>
   {{/if}}
 {{/if}}
@@ -24,7 +24,7 @@
         {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
       {{/if}}
       {{#if canClearPin}}
-        <a href="#" {{action clearPin this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+        <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 726b1d3a759..3c03c87774f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -19,7 +19,7 @@
                     {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action clearPin this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
                   {{/if}}
                 </div>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index 3d222889d2c..aa5725b767f 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -30,7 +30,7 @@
                     {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action clearPin this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -60,7 +60,7 @@
       <figure title="{{i18n week_desc}}">{{number topics_week}} <figcaption>{{i18n week}}</figcaption></figure>
 
       {{#if controller.canEdit}}
-        <a href='#' {{action editCategory this}} class='btn btn-small'>{{i18n category.edit}}</a>
+        <a href='#' {{action "editCategory" this}} class='btn btn-small'>{{i18n category.edit}}</a>
       {{/if}}
 
     </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
index cd11faed578..670c9f5b140 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
@@ -14,7 +14,7 @@
         {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
       {{/if}}
       {{#if canClearPin}}
-        <a href="#" {{action clearPin this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+        <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 1fde21ccc7f..806ffd6548d 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -23,7 +23,7 @@
           <tr>
             <td></td>
             <td>
-              <a id="forgot-password-link" {{action showForgotPassword}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
             </td>
           </tr>
         </table>
@@ -40,12 +40,12 @@
   {{#if canLoginLocal}}
     <button class='btn btn-large btn-primary'
       {{bind-attr disabled="loginDisabled"}}
-      {{action login}}>
+      {{action "login"}}>
         <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
     </button>
 
     {{#if showSignupLink}}
-      <button class="btn btn-large" id="new-account-link" {{action showCreateAccount}}>
+      <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
         {{i18n create_account.title}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
index 0c7e5104c9e..2d46cf53942 100644
--- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
@@ -4,5 +4,5 @@
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action closeModal}}>{{i18n post.archetypes.save}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n post.archetypes.save}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
index 15ac4ffcddd..e0eaf6b73ac 100644
--- a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
@@ -1,10 +1,10 @@
-<form {{action saveAutoClose on="submit"}}>
+<form {{action "saveAutoClose" on="submit"}}>
   <div class="modal-body">
     {{auto-close-form autoCloseTime=auto_close_time autoCloseValid=auto_close_valid}}
   </div>
   <div class="modal-footer">
     <button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</button>
-    <a {{action closeModal}}>{{i18n cancel}}</a>
-    <button class='btn pull-right' {{action removeAutoClose}}>{{i18n topic.auto_close_remove}}</button>
+    <a {{action "closeModal"}}>{{i18n cancel}}</a>
+    <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n topic.auto_close_remove}}</button>
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
index 074dc8ffad2..4861aa42b94 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
@@ -5,6 +5,6 @@
 {{#if loading}}
   <div class='loading'>{{i18n loading}}</div>
 {{else}}
-  <button class='btn' {{action changeCategory}}>Change Category</button>
+  <button class='btn' {{action "changeCategory"}}>Change Category</button>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
index 2dad1a349e5..4e37543dba0 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
@@ -7,4 +7,4 @@
   </div>
 {{/each}}
 
-<button class='btn' {{bind-attr disabled="disabled"}} {{action changeNotificationLevel}}>{{i18n topics.bulk.notification_level}}</button>
+<button class='btn' {{bind-attr disabled="disabled"}} {{action "changeNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
index 6a4ebc637c1..e8cc1c2ee0e 100644
--- a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
@@ -12,5 +12,5 @@
 </div>
 
 <div class="modal-footer">
-    <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action changeOwnershipOfPosts}}>{{buttonTitle}}</button>
+    <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action "changeOwnershipOfPosts"}}>{{buttonTitle}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 85427673503..c22bc997d66 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -71,7 +71,6 @@
 
         </table>
 
-        {{log userFields}}
         {{#if userFields}}
           <div class='user-fields'>
             {{#each userFields}}
@@ -87,11 +86,11 @@
 
   {{#if showCreateForm}}
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action createAccount}}>{{i18n create_account.title}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n create_account.title}}</button>
       {{#if formSubmitted}}
         &nbsp; <i class='fa fa-spinner fa-spin'></i>
       {{else}}
-        <button class="btn btn-large" id="login-link" {{action showLogin}}>
+        <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
           {{i18n log_in}}
         </button>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
index 99b6acf75fb..69232f908db 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
@@ -29,7 +29,7 @@
       {{/if}}
       {{#if topic_url}}
         <br/>
-        <button class="btn btn-small" {{action showCategoryTopic}}><i class="fa fa-pencil"></i>{{i18n category.change_in_category_topic}}</button>
+        <button class="btn btn-small" {{action "showCategoryTopic"}}><i class="fa fa-pencil"></i>{{i18n category.change_in_category_topic}}</button>
       {{/if}}
     </section>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
index 1e09f67618f..8291af74925 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
@@ -6,7 +6,7 @@
         {{{i18n "category.can"}}}
         <span class="permission">{{permission.description}}</span>
         {{#if controller.editingPermissions}}
-          <a {{action removePermission this}}><i class="fa fa-times-circle"></i></a>
+          <a {{action "removePermission" this}}><i class="fa fa-times-circle"></i></a>
         {{/if}}
       </li>
     {{/each}}
@@ -14,8 +14,8 @@
   {{#if controller.editingPermissions}}
     {{view Ember.Select content=availableGroups value=selectedGroup}}
     {{view Ember.Select class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}}
-    <button {{action addPermission selectedGroup selectedPermission}} class="btn btn-small">{{i18n category.add_permission}}</button>
+    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n category.add_permission}}</button>
   {{else}}
-    <button {{action editPermissions}} class="btn btn-small">{{i18n category.edit_permissions}}</button>
+    <button {{action "editPermissions"}} class="btn btn-small">{{i18n category.edit_permissions}}</button>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
index 786de606f49..314ee7366d3 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category.hbs
@@ -15,9 +15,9 @@
   </div>
 
   <div class="modal-footer">
-    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action saveCategory}}>{{buttonTitle}}</button>
+    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "saveCategory"}}>{{buttonTitle}}</button>
     {{#if can_delete}}
-      <button class='btn btn-danger pull-right' {{bind-attr disabled="deleteDisabled"}} {{action deleteCategory}}><i class="fa fa-trash-o"></i>{{deleteButtonTitle}}</button>
+      <button class='btn btn-danger pull-right' {{bind-attr disabled="deleteDisabled"}} {{action "deleteCategory"}}><i class="fa fa-trash-o"></i>{{deleteButtonTitle}}</button>
     {{else}}
       <div class="cannot_delete_reason">
         {{{cannot_delete_reason}}}
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 41d95f33073..eaf5f160848 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -4,7 +4,7 @@
     {{#each flagsAvailable itemController="flag-action-type"}}
       <div class='controls'>
         <label class='radio'>
-          <input type='radio' id="radio_{{unbound name_key}}" {{action changePostActionType this}} name='post_action_type_index'> <strong>{{formattedName}}</strong>
+          <input type='radio' id="radio_{{unbound name_key}}" {{action "changePostActionType" this}} name='post_action_type_index'> <strong>{{formattedName}}</strong>
           {{#if showDescription}}
             <div class='description'>{{{description}}}</div>
           {{/if}}
@@ -21,13 +21,13 @@
 
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action createFlag}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.submit_tooltip}}">{{{submitText}}}</button>
+  <button class='btn btn-primary' {{action "createFlag"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.submit_tooltip}}">{{{submitText}}}</button>
 
   {{#if canTakeAction}}
-    <button class='btn btn-danger' {{action takeAction}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.take_action_tooltip}}"><i class="fa fa-gavel"></i>{{i18n flagging.take_action}}</button>
+    <button class='btn btn-danger' {{action "takeAction"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.take_action_tooltip}}"><i class="fa fa-gavel"></i>{{i18n flagging.take_action}}</button>
   {{/if}}
 
   {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action deleteSpammer userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
+    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
index 7c9c2d84157..13c4ae09a17 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
@@ -4,6 +4,6 @@
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     </div>
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action submit}}>{{i18n forgot_password.reset}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "submit"}}>{{i18n forgot_password.reset}}</button>
     </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 8e4c60343d9..5ef0ef98366 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,18 +1,18 @@
 <div class="modal-body">
   <div>
     <div id="revision-controls">
-      <button title="{{i18n post.revisions.controls.first}}" {{bind-attr class=":btn :standard displayGoToFirst::invisible" disabled=loading}} {{action loadFirstVersion}}><i class="fa fa-fast-backward"></i></button>
-      <button title="{{i18n post.revisions.controls.previous}}" {{bind-attr class=":btn :standard displayGoToPrevious::invisible" disabled=loading}} {{action loadPreviousVersion}}><i class="fa fa-backward"></i></button>
+      <button title="{{i18n post.revisions.controls.first}}" {{bind-attr class=":btn :standard displayGoToFirst::invisible" disabled=loading}} {{action "loadFirstVersion"}}><i class="fa fa-fast-backward"></i></button>
+      <button title="{{i18n post.revisions.controls.previous}}" {{bind-attr class=":btn :standard displayGoToPrevious::invisible" disabled=loading}} {{action "loadPreviousVersion"}}><i class="fa fa-backward"></i></button>
       <div id="revision-numbers" {{bind-attr class="displayRevisions::invisible"}}>{{{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="version" totalBinding="revisions_count"}}}</div>
-      <button title="{{i18n post.revisions.controls.next}}" {{bind-attr class=":btn :standard displayGoToNext::invisible" disabled=loading}} {{action loadNextVersion}}><i class="fa fa-forward"></i></button>
-      <button title="{{i18n post.revisions.controls.last}}" {{bind-attr class=":btn :standard displayGoToLast::invisible" disabled=loading}} {{action loadLastVersion}}><i class="fa fa-fast-forward"></i></button>
+      <button title="{{i18n post.revisions.controls.next}}" {{bind-attr class=":btn :standard displayGoToNext::invisible" disabled=loading}} {{action "loadNextVersion"}}><i class="fa fa-forward"></i></button>
+      <button title="{{i18n post.revisions.controls.last}}" {{bind-attr class=":btn :standard displayGoToLast::invisible" disabled=loading}} {{action "loadLastVersion"}}><i class="fa fa-fast-forward"></i></button>
     </div>
     {{#if loading}}<div id='revision-loading'><i class='fa fa-spinner fa-spin'></i>{{i18n loading}}</div>{{/if}}
     <div id="display-modes">
-      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action displayInline}}>{{{i18n post.revisions.displays.inline.button}}}</button>
+      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action "displayInline"}}>{{{i18n post.revisions.displays.inline.button}}}</button>
       {{#unless site.mobileView}}
-        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action displaySideBySide}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
-        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action displaySideBySideMarkdown}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action "displaySideBySide"}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action "displaySideBySideMarkdown"}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
       {{/unless}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index 34b854fb9e7..d2a129f5600 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -21,9 +21,9 @@
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action closeModal}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
   {{else}}
-    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action createInvite}}><i class="fa fa-envelope"></i>{{buttonTitle}}</button>
+    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "createInvite"}}><i class="fa fa-envelope"></i>{{buttonTitle}}</button>
   {{/if}}
 
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
index 30ea58dcd45..d4635dead92 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
@@ -15,9 +15,9 @@
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action closeModal}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
   {{else}}
-    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action invite}}>{{buttonTitle}}</button>
+    <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "invite"}}>{{buttonTitle}}</button>
   {{/if}}
 
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 920b9c61bdf..8ee34887b0f 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -21,7 +21,7 @@
                 {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}} &nbsp;
             </td>
             <td>
-              <a id="forgot-password-link" {{action showForgotPassword}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
             </td>
           </tr>
           <tr>
@@ -40,13 +40,13 @@
   {{#if canLoginLocal}}
     <button class="btn btn-large btn-primary"
       {{bind-attr disabled="loginDisabled"}}
-      {{action login}}>
+      {{action "login"}}>
         <i class="fa fa-unlock"></i>&nbsp;{{loginButtonText}}
     </button>
 
     {{#if showSignupLink}}
       &nbsp;
-      <button class="btn btn-large" id="new-account-link" {{action createAccount}}>
+      <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
         {{i18n create_account.title}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
index a2fc09ed96d..b6a7b526991 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
@@ -13,5 +13,5 @@
 </div>
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action movePostsToExistingTopic}}><i class="fa fa-sign-out"></i>{{buttonTitle}}</button>
+  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action "movePostsToExistingTopic"}}><i class="fa fa-sign-out"></i>{{buttonTitle}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/modal.hbs b/app/assets/javascripts/discourse/templates/modal/modal.hbs
index 206991dee02..8116605100f 100644
--- a/app/assets/javascripts/discourse/templates/modal/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/modal.hbs
@@ -3,7 +3,7 @@
     <div class="modal-inner-container">
 
       <div class="modal-header">
-        <a class="close" {{action closeModal}}><i class='fa fa-times'></i></a>
+        <a class="close" {{action "closeModal"}}><i class='fa fa-times'></i></a>
         <h3>{{title}}</h3>
         <div class="clearfix"></div>
       </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
index 182dc57787d..cee8245db00 100644
--- a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
@@ -7,5 +7,5 @@
   {{/if}}
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action closeModal}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
index 1c53e395793..ce83a0f191e 100644
--- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
@@ -18,5 +18,5 @@
 </div>
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action movePostsToNewTopic}}><i class='fa fa-sign-out'></i>{{buttonTitle}}</button>
+  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action "movePostsToNewTopic"}}><i class='fa fa-sign-out'></i>{{buttonTitle}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index 7e0b5f7ee6a..7644841f582 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -8,8 +8,8 @@
 </ul>
 
 {{#if canCreateCategory}}
-  <button class='btn btn-default' {{action createCategory}}><i class='fa fa-plus'></i>{{i18n category.create}}</button>
+  <button class='btn btn-default' {{action "createCategory"}}><i class='fa fa-plus'></i>{{i18n category.create}}</button>
 {{/if}}
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index a4a6ecdbda3..a149080878c 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -15,11 +15,11 @@
 {{/if}}
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
 {{/if}}
 
 {{#if canEditCategory}}
-  <button class='btn btn-default' {{action editCategory category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
+  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
 {{/if}}
 
 <section class='category-heading'>
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index 5acd6e0952c..88b276198ff 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -8,5 +8,5 @@
 </ul>
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action createTopic}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs
index 175870f2f1f..ff8a6bdd4e8 100644
--- a/app/assets/javascripts/discourse/templates/search.hbs
+++ b/app/assets/javascripts/discourse/templates/search.hbs
@@ -19,7 +19,7 @@
       </ul>
         <div class='no-results'>
             {{#if resultType.more}}
-                <a href='#' class='filter' {{action moreOfType resultType.type bubbles=false}}>{{i18n show_more}} <i class="fa fa-chevron-down"></i></a>
+                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n show_more}} <i class="fa fa-chevron-down"></i></a>
             {{else}}
             {{/if}}
         </div>
diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs
index 73ad0abf557..d81da9289b2 100644
--- a/app/assets/javascripts/discourse/templates/share.hbs
+++ b/app/assets/javascripts/discourse/templates/share.hbs
@@ -9,5 +9,5 @@
 {{each shareLinks itemView='share-link'}}
 
 <div class='link'>
-  <a href='#' {{action close}} title='{{i18n share.close}}'><i class="fa fa-times-circle"></i></a>
+  <a href='#' {{action "close"}} title='{{i18n share.close}}'><i class="fa fa-times-circle"></i></a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/share_link.hbs b/app/assets/javascripts/discourse/templates/share_link.hbs
index f7837fc58ed..c10ee05981a 100644
--- a/app/assets/javascripts/discourse/templates/share_link.hbs
+++ b/app/assets/javascripts/discourse/templates/share_link.hbs
@@ -1,5 +1,5 @@
 {{#if openInPopup}}
-  <a href="#" {{action sharePopup target href}} {{bind-attr title="title"}}><i {{bind-attr class=":fa iconClass"}}></i></a>
+  <a href="#" {{action "sharePopup" target href}} {{bind-attr title="title"}}><i {{bind-attr class=":fa iconClass"}}></i></a>
 {{else}}
   <a {{bind-attr href="href"}} {{bind-attr title="title"}} target="_blank"><i {{bind-attr class=":fa iconClass"}}></i></a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/site_map.hbs b/app/assets/javascripts/discourse/templates/site_map.hbs
index dd9a9f64dcd..22707590760 100644
--- a/app/assets/javascripts/discourse/templates/site_map.hbs
+++ b/app/assets/javascripts/discourse/templates/site_map.hbs
@@ -22,7 +22,7 @@
       </li>
     {{/if}}
     {{#if showKeyboardShortcuts}}
-      <li><a href="#" {{action keyboardShortcuts}} class="keyboard-shortcuts-link">{{i18n keyboard_shortcuts_help.title}}</a>
+      <li><a href="#" {{action "keyboardShortcuts"}} class="keyboard-shortcuts-link">{{i18n keyboard_shortcuts_help.title}}</a>
     {{/if}}
     <li>
       <a href="{{unbound faqUrl}}" class="faq-link">{{i18n faq}}</a>
@@ -31,7 +31,7 @@
       {{#link-to 'about'}}{{i18n about.simple_title}}{{/link-to}}
     </li>
     {{#if showMobileToggle}}
-      <li><a href="#" class="mobile-toggle-link" {{action toggleMobileView}}>{{boundI18n mobileViewLinkTextKey}}</a></li>
+      <li><a href="#" class="mobile-toggle-link" {{action "toggleMobileView"}}>{{boundI18n mobileViewLinkTextKey}}</a></li>
     {{/if}}
   </ul>
 
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index a8a4c0db6f6..e6aa2f99a71 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -3,7 +3,7 @@
     {{{html}}}
 
     {{#if showLoginButton}}
-      <button class="btn btn-primary" {{action showLogin}}><i class="fa fa-user"></i>{{i18n log_in}}</button>
+      <button class="btn btn-primary" {{action "showLogin"}}><i class="fa fa-user"></i>{{i18n log_in}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/topic-entrance.hbs
index 41f86c3c293..8613848bb7f 100644
--- a/app/assets/javascripts/discourse/templates/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-entrance.hbs
@@ -1,6 +1,6 @@
-<button {{action enterTop}} class='btn full no-text jump-top'>
+<button {{action "enterTop"}} class='btn full no-text jump-top'>
   <i class='fa fa-caret-up'></i> {{{topDate}}}
 </button>
-<button {{action enterBottom}} class='btn full no-text jump-bottom'>
+<button {{action "enterBottom"}} class='btn full no-text jump-bottom'>
   {{{bottomDate}}} <i class='fa fa-caret-down'></i>
 </button>
diff --git a/app/assets/javascripts/discourse/templates/topic-progress.hbs b/app/assets/javascripts/discourse/templates/topic-progress.hbs
index 9bea0ff4a73..a04f5bec484 100644
--- a/app/assets/javascripts/discourse/templates/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-progress.hbs
@@ -1,13 +1,13 @@
 {{#if expanded}}
   <nav id='topic-progress-expanded'>
-    <button {{action jumpTop}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
+    <button {{action "jumpTop"}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
       <i class="fa fa-caret-up"></i>
       {{i18n topic.progress.go_top}}
     </button>
     <div class='jump-form'>
-      {{input value=toPostIndex}} <button {{action jumpPost}} class='btn'>{{i18n topic.progress.go}}</button>
+      {{input value=toPostIndex}} <button {{action "jumpPost"}} class='btn'>{{i18n topic.progress.go}}</button>
     </div>
-    <button {{action jumpBottom}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
+    <button {{action "jumpBottom"}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
       {{i18n topic.progress.go_bottom}}
       <i class="fa fa-caret-down"></i>
     </button>
diff --git a/app/assets/javascripts/discourse/templates/user-expansion.hbs b/app/assets/javascripts/discourse/templates/user-expansion.hbs
index fbaaab68ef9..c681571c393 100644
--- a/app/assets/javascripts/discourse/templates/user-expansion.hbs
+++ b/app/assets/javascripts/discourse/templates/user-expansion.hbs
@@ -43,17 +43,17 @@
       {{/if}}
 
       {{#if user.can_send_private_message_to_user}}
-        <button class='btn btn-primary' {{action composePrivateMessage user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</button>
+        <button class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</button>
       {{/if}}
 
       {{#link-to 'user' user class="btn"}}{{fa-icon "user"}}{{i18n user.profile}}{{/link-to}}
 
       {{#if showFilter}}
-      <button class='btn' {{action togglePosts user}}>{{fa-icon "filter"}}{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
+      <button class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</button>
       {{/if}}
 
       {{#if hasUserFilters}}
-      <button class='btn' {{action cancelFilter}}>{{fa-icon "times"}}{{i18n topic.filters.cancel}}</button>
+      <button class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n topic.filters.cancel}}</button>
       {{/if}}
     </div>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user/about.hbs b/app/assets/javascripts/discourse/templates/user/about.hbs
index c1c1e328665..c535b10cf0c 100644
--- a/app/assets/javascripts/discourse/templates/user/about.hbs
+++ b/app/assets/javascripts/discourse/templates/user/about.hbs
@@ -23,7 +23,7 @@
 
   <div class="control-group">
     <div class="controls">
-        <button {{action changeAbout}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
+        <button {{action "changeAbout"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
         {{#if saved}}{{i18n saved}}{{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index e9951cae46a..0072c3fb6cb 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -16,7 +16,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action save}}>{{savingStatus}}</button>
+        <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action "save"}}>{{savingStatus}}</button>
         {{#if saved}}{{i18n saved}}{{/if}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/templates/user/email.hbs b/app/assets/javascripts/discourse/templates/user/email.hbs
index 8503485d140..5f35accede9 100644
--- a/app/assets/javascripts/discourse/templates/user/email.hbs
+++ b/app/assets/javascripts/discourse/templates/user/email.hbs
@@ -39,7 +39,7 @@
 
       <div class="control-group">
         <div class="controls">
-            <button {{action changeEmail}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
+            <button {{action "changeEmail"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/invited.hbs b/app/assets/javascripts/discourse/templates/user/invited.hbs
index 3a0a4a4a634..a3a12dd91c4 100644
--- a/app/assets/javascripts/discourse/templates/user/invited.hbs
+++ b/app/assets/javascripts/discourse/templates/user/invited.hbs
@@ -4,7 +4,7 @@
     <h2>{{i18n user.invited.title}}</h2>
 
     <div class="pull-right">
-      <button {{action showInvite}} class='btn'>{{i18n user.invited.create}}</button>
+      <button {{action "showInvite"}} class='btn'>{{i18n user.invited.create}}</button>
       {{#if canBulkInvite}}
         {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
       {{/if}}
@@ -55,7 +55,7 @@
                 {{#if invite.rescinded}}
                   {{i18n user.invited.rescinded}}
                 {{else}}
-                  <button class='btn' {{action rescind invite}}><i class="fa fa-times"></i>{{i18n user.invited.rescind}}</button>
+                  <button class='btn' {{action "rescind" invite}}><i class="fa fa-times"></i>{{i18n user.invited.rescind}}</button>
                 {{/if}}
               </td>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
index ce4c3df3672..5437e4d358f 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
@@ -1,2 +1,2 @@
-<button {{action save}} {{bind-attr disabled="saving"}} class="btn btn-primary">{{saveButtonText}}</button>
+<button {{action "save"}} {{bind-attr disabled="saving"}} class="btn btn-primary">{{saveButtonText}}</button>
 {{#if saved}}{{i18n saved}}{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 862817baa64..26b175641c0 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -14,7 +14,7 @@
         <i class="icon {{unbound icon}}"></i>
         {{#grouped-each items}}
           {{#if bookmarkType}}
-            <button class="btn btn-default remove-bookmark" {{action removeBookmark this}}>
+            <button class="btn btn-default remove-bookmark" {{action "removeBookmark" this}}>
               <i class="fa fa-times"></i>
               {{i18n "bookmarks.remove"}}
             </button>
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index b613dc16f26..c5bec771ccf 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -150,7 +150,7 @@
                   {{#if email}}
                     {{email}}
                   {{else}}
-                    <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action checkEmail this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+                    <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
                   {{/if}}
                 </dd>
               {{/if}}
@@ -164,7 +164,7 @@
 
         <section class='controls'>
           {{#if can_send_private_message_to_user}}
-            <button class='btn btn-primary' {{action composePrivateMessage}}>
+            <button class='btn btn-primary' {{action "composePrivateMessage"}}>
               <i class='fa fa-envelope'></i>
               {{i18n user.private_message}}
             </button>
diff --git a/app/assets/javascripts/discourse/templates/user/username.hbs b/app/assets/javascripts/discourse/templates/user/username.hbs
index a1cf62037ee..bf392c4b121 100644
--- a/app/assets/javascripts/discourse/templates/user/username.hbs
+++ b/app/assets/javascripts/discourse/templates/user/username.hbs
@@ -30,7 +30,7 @@
 
     <div class="control-group">
       <div class="controls">
-          <button {{action changeUsername}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
+          <button {{action "changeUsername"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
           {{#if saved}}{{i18n saved}}{{/if}}
       </div>
     </div>
diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
index ea98530ebb6..27a856ab93a 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
@@ -1,6 +1,6 @@
 <table>
   {{#each poll.options}}
-    <tr {{bind-attr class=checked:active}} {{action selectOption option}}>
+    <tr {{bind-attr class=checked:active}} {{action "selectOption" option}}>
       <td class="radio">
         <input type="radio" name="poll" {{bind-attr checked=checked disabled=controller.disableRadio}}>
       </td>
@@ -15,7 +15,7 @@
 </table>
 
 <div class='row'>
-<button {{action toggleShowResults}} class="btn btn-small show-results">
+<button {{action "toggleShowResults"}} class="btn btn-small show-results">
   {{#if showResults}}
     <i class="fa fa-eye-slash"></i>
     {{i18n poll.results.hide}}
@@ -26,7 +26,7 @@
 </button>
 
 {{#if showToggleClosePoll}}
-  <button {{action toggleClosePoll}} class="btn btn-small toggle-poll">
+  <button {{action "toggleClosePoll"}} class="btn btn-small toggle-poll">
     {{#if poll.closed}}
       <i class="fa fa-unlock-alt"></i>
       {{i18n poll.open_poll}}