diff --git a/.template-lintrc.js b/.template-lintrc.js
index 955a8d36d6f..604f813f523 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -19,7 +19,11 @@ module.exports = {
     "no-inline-styles": false,
     "no-input-block": true,
     "no-input-tagname": true,
-    "no-implicit-this": false,
+    "no-implicit-this": {
+      allow: [
+        'loading-spinner'
+      ]
+    },
     "no-invalid-interactive": true,
     "no-invalid-link-text": true,
     "no-invalid-meta": true,
diff --git a/app/assets/javascripts/admin/addon/templates/admin.hbs b/app/assets/javascripts/admin/addon/templates/admin.hbs
index cdfe1692918..7392a53d3c3 100644
--- a/app/assets/javascripts/admin/addon/templates/admin.hbs
+++ b/app/assets/javascripts/admin/addon/templates/admin.hbs
@@ -4,24 +4,24 @@
       <div class="admin-main-nav">
         <ul class="nav nav-pills">
           <NavItem @route="admin.dashboard" @label="admin.dashboard.title" />
-          {{#if currentUser.admin}}
+          {{#if this.currentUser.admin}}
             <NavItem @route="adminSiteSettings" @label="admin.site_settings.title" />
           {{/if}}
           <NavItem @route="adminUsers" @label="admin.users.title" />
-          {{#if showGroups}}
+          {{#if this.showGroups}}
             <NavItem @route="groups" @label="admin.groups.title" />
           {{/if}}
-          {{#if showBadges}}
+          {{#if this.showBadges}}
             <NavItem @route="adminBadges" @label="admin.badges.title" />
           {{/if}}
-          {{#if currentUser.admin}}
+          {{#if this.currentUser.admin}}
             <NavItem @route="adminEmail" @label="admin.email.title" />
           {{/if}}
           <NavItem @route="adminLogs" @label="admin.logs.title" />
           <NavItem @route="adminCustomize" @label="admin.customize.title" />
-          {{#if currentUser.admin}}
+          {{#if this.currentUser.admin}}
             <NavItem @route="adminApi" @label="admin.api.title" />
-            {{#if siteSettings.enable_backups}}
+            {{#if this.siteSettings.enable_backups}}
               <NavItem @route="admin.backups" @label="admin.backups.title" />
             {{/if}}
           {{/if}}
@@ -31,7 +31,7 @@
       </div>
 
       <div class="boxed white admin-content">
-        <div class="admin-contents {{adminContentsClassName}}">
+        <div class="admin-contents {{this.adminContentsClassName}}">
           {{outlet}}
         </div>
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
index 24816b5d8da..c99261ad943 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-index.hbs
@@ -1,6 +1,6 @@
 <DButton @class="btn-primary" @action={{route-action "new"}} @icon="plus" @label="admin.api.new_key" />
 
-{{#if model}}
+{{#if this.model}}
   <LoadMore @selector=".api-keys tr" @action={{action "loadMore"}}>
     <table class="api-keys grid">
       <thead>
@@ -12,7 +12,7 @@
         <th>&nbsp;</th>
       </thead>
       <tbody>
-        {{#each model as |k|}}
+        {{#each this.model as |k|}}
           <tr class={{if k.revoked_at "revoked"}}>
             <td class="key">
               {{#if k.revoked_at}}{{d-icon "times-circle"}}{{/if}}
@@ -57,7 +57,7 @@
     </table>
   </LoadMore>
 
-  <ConditionalLoadingSpinner @condition={{loading}} />
+  <ConditionalLoadingSpinner @condition={{this.loading}} />
 {{else}}
   <p>{{i18n "admin.api.none"}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
index d8dc05558e1..3c9c5310d05 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-new.hbs
@@ -4,9 +4,9 @@
 </LinkTo>
 
 <div class="api-key api-key-new">
-  {{#if model.id}}
+  {{#if this.model.id}}
     <AdminFormRow @label="admin.api.key">
-      <div>{{model.key}}</div>
+      <div>{{this.model.key}}</div>
     </AdminFormRow>
     <AdminFormRow>
       {{i18n "admin.api.not_shown_again"}}
@@ -16,16 +16,16 @@
     </AdminFormRow>
   {{else}}
     <AdminFormRow @label="admin.api.description">
-      <Input @value={{model.description}} @maxlength="255" placeholder={{i18n "admin.api.description_placeholder"}} />
+      <Input @value={{this.model.description}} @maxlength="255" placeholder={{i18n "admin.api.description_placeholder"}} />
     </AdminFormRow>
 
     <AdminFormRow @label="admin.api.user_mode">
-      <ComboBox @content={{userModes}} @value={{userMode}} @onChange={{action "changeUserMode"}} />
+      <ComboBox @content={{this.userModes}} @value={{this.userMode}} @onChange={{action "changeUserMode"}} />
     </AdminFormRow>
 
-    {{#if showUserSelector}}
+    {{#if this.showUserSelector}}
       <AdminFormRow @label="admin.api.user">
-        <EmailGroupUserChooser @value={{model.username}} @onChange={{action "updateUsername"}} @options={{hash
+        <EmailGroupUserChooser @value={{this.model.username}} @onChange={{action "updateUsername"}} @options={{hash
             maximum=1
             filterPlaceholder="admin.api.user_placeholder"
           }} />
@@ -33,16 +33,16 @@
     {{/if}}
 
     <AdminFormRow @label="admin.api.scope_mode">
-      <ComboBox @content={{scopeModes}} @value={{scopeMode}} @onChange={{action "changeScopeMode"}} />
+      <ComboBox @content={{this.scopeModes}} @value={{this.scopeMode}} @onChange={{action "changeScopeMode"}} />
 
-      {{#if (eq scopeMode "read_only")}}
+      {{#if (eq this.scopeMode "read_only")}}
         <p>{{i18n "admin.api.scopes.descriptions.global.read"}}</p>
-      {{else if (eq scopeMode "global")}}
+      {{else if (eq this.scopeMode "global")}}
         <p>{{i18n "admin.api.scopes.global_description"}}</p>
       {{/if}}
     </AdminFormRow>
 
-    {{#if (eq scopeMode "granular")}}
+    {{#if (eq this.scopeMode "granular")}}
       <h2 class="scopes-title">{{i18n "admin.api.scopes.title"}}</h2>
       <p>{{i18n "admin.api.scopes.description"}}</p>
       <table class="scopes-table grid">
@@ -55,7 +55,7 @@
           </tr>
         </thead>
         <tbody>
-          {{#each-in scopes as |resource actions|}}
+          {{#each-in this.scopes as |resource actions|}}
             <tr class="scope-resource-name">
               <td><b>{{resource}}</b></td>
               <td></td>
@@ -86,6 +86,6 @@
       </table>
     {{/if}}
 
-    <DButton @icon="check" @label="admin.api.save" @action={{action "save"}} @class="btn-primary" @disabled={{saveDisabled}} />
+    <DButton @icon="check" @label="admin.api.save" @action={{action "save"}} @class="btn-primary" @disabled={{this.saveDisabled}} />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
index 5707d4cf3e9..43ae76c3ce7 100644
--- a/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/api-keys-show.hbs
@@ -5,21 +5,21 @@
 
 <div class="api-key api-key-show">
   <AdminFormRow @label="admin.api.key">
-    {{#if model.revoked_at}}{{d-icon "times-circle"}}{{/if}}
-    {{model.truncatedKey}}
+    {{#if this.model.revoked_at}}{{d-icon "times-circle"}}{{/if}}
+    {{this.model.truncatedKey}}
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.description">
-    {{#if editingDescription}}
-      <Input @value={{buffered.description}} @maxlength="255" placeholder={{i18n "admin.api.description_placeholder"}} />
+    {{#if this.editingDescription}}
+      <Input @value={{this.buffered.description}} @maxlength="255" placeholder={{i18n "admin.api.description_placeholder"}} />
     {{else}}
       <span>
-        {{if model.description model.description (i18n "admin.api.no_description")}}
+        {{if this.model.description this.model.description (i18n "admin.api.no_description")}}
       </span>
     {{/if}}
 
     <div class="controls">
-      {{#if editingDescription}}
+      {{#if this.editingDescription}}
         <DButton @class="ok" @action={{action "saveDescription"}} @icon="check" />
         <DButton @class="cancel" @action={{action "editDescription"}} @icon="times" />
       {{else}}
@@ -29,9 +29,9 @@
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.user">
-    {{#if model.user}}
-      <LinkTo @route="adminUser" @model={{model.user}}>
-        {{avatar model.user imageSize="small"}} {{model.user.username}}
+    {{#if this.model.user}}
+      <LinkTo @route="adminUser" @model={{this.model.user}}>
+        {{avatar this.model.user imageSize="small"}} {{this.model.user.username}}
       </LinkTo>
     {{else}}
       {{i18n "admin.api.all_users"}}
@@ -39,38 +39,38 @@
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.created">
-    {{format-date model.created_at leaveAgo="true"}}
+    {{format-date this.model.created_at leaveAgo="true"}}
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.updated">
-    {{format-date model.updated_at leaveAgo="true"}}
+    {{format-date this.model.updated_at leaveAgo="true"}}
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.last_used">
-    {{#if model.last_used_at}}
-      {{format-date model.last_used_at leaveAgo="true"}}
+    {{#if this.model.last_used_at}}
+      {{format-date this.model.last_used_at leaveAgo="true"}}
     {{else}}
       {{i18n "admin.api.never_used"}}
     {{/if}}
   </AdminFormRow>
 
   <AdminFormRow @label="admin.api.revoked">
-    {{#if model.revoked_at}}
-      {{format-date model.revoked_at leaveAgo="true"}}
+    {{#if this.model.revoked_at}}
+      {{format-date this.model.revoked_at leaveAgo="true"}}
     {{else}}
       <span>{{i18n "no_value"}}</span>
     {{/if}}
     <div class="controls">
-      {{#if model.revoked_at}}
-        <DButton @action={{action "undoRevokeKey"}} @actionParam={{model}} @icon="undo" @label="admin.api.undo_revoke" />
-        <DButton @action={{action "deleteKey"}} @actionParam={{model}} @icon="trash-alt" @label="admin.api.delete" @class="btn-danger" />
+      {{#if this.model.revoked_at}}
+        <DButton @action={{action "undoRevokeKey"}} @actionParam={{this.model}} @icon="undo" @label="admin.api.undo_revoke" />
+        <DButton @action={{action "deleteKey"}} @actionParam={{this.model}} @icon="trash-alt" @label="admin.api.delete" @class="btn-danger" />
       {{else}}
-        <DButton @class="btn-danger" @action={{action "revokeKey"}} @actionParam={{model}} @icon="times" @label="admin.api.revoke" />
+        <DButton @class="btn-danger" @action={{action "revokeKey"}} @actionParam={{this.model}} @icon="times" @label="admin.api.revoke" />
       {{/if}}
     </div>
   </AdminFormRow>
 
-  {{#if model.api_key_scopes.length}}
+  {{#if this.model.api_key_scopes.length}}
     <h2 class="scopes-title">{{i18n "admin.api.scopes.title"}}</h2>
 
     <table class="scopes-table grid">
@@ -83,7 +83,7 @@
         </tr>
       </thead>
       <tbody>
-        {{#each model.api_key_scopes as |scope|}}
+        {{#each this.model.api_key_scopes as |scope|}}
           <tr>
             <td>{{scope.resource}}</td>
             <td>
diff --git a/app/assets/javascripts/admin/addon/templates/backups-index.hbs b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
index 732b8f308b0..1261659a46b 100644
--- a/app/assets/javascripts/admin/addon/templates/backups-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups-index.hbs
@@ -1,17 +1,17 @@
 <div class="backup-options">
-  {{#if localBackupStorage}}
-    <UppyBackupUploader @done={{route-action "uploadSuccess"}} @localBackupStorage={{localBackupStorage}} />
+  {{#if this.localBackupStorage}}
+    <UppyBackupUploader @done={{route-action "uploadSuccess"}} @localBackupStorage={{this.localBackupStorage}} />
   {{else}}
     <UppyBackupUploader @done={{route-action "remoteUploadSuccess"}} />
   {{/if}}
 
-  {{#if site.isReadOnly}}
-    <DButton @class="btn-default" @icon="far-eye" @action={{action "toggleReadOnlyMode"}} @disabled={{status.isOperationRunning}} @title="admin.backups.read_only.disable.title" @label="admin.backups.read_only.disable.label" />
+  {{#if this.site.isReadOnly}}
+    <DButton @class="btn-default" @icon="far-eye" @action={{action "toggleReadOnlyMode"}} @disabled={{this.status.isOperationRunning}} @title="admin.backups.read_only.disable.title" @label="admin.backups.read_only.disable.label" />
   {{else}}
-    <DButton @class="btn-default" @icon="far-eye" @action={{action "toggleReadOnlyMode"}} @disabled={{status.isOperationRunning}} @title="admin.backups.read_only.enable.title" @label="admin.backups.read_only.enable.label" />
+    <DButton @class="btn-default" @icon="far-eye" @action={{action "toggleReadOnlyMode"}} @disabled={{this.status.isOperationRunning}} @title="admin.backups.read_only.enable.title" @label="admin.backups.read_only.enable.label" />
   {{/if}}
   <div class="backup-message">
-    {{#if status.restoreDisabled}}
+    {{#if this.status.restoreDisabled}}
       <a href="site_settings/category/all_results?filter=allow_restore">{{d-icon "info-circle"}} {{i18n "admin.backups.operations.restore.is_disabled"}}</a>
     {{/if}}
   </div>
@@ -23,19 +23,19 @@
     <th></th>
   </thead>
   <tbody>
-    {{#each model as |backup|}}
+    {{#each this.model as |backup|}}
       <tr>
         <td class="backup-filename">{{backup.filename}}</td>
         <td class="backup-size">{{human-size backup.size}}</td>
         <td class="backup-controls">
           <div>
             <DButton @class="btn-default download" @action={{action "download"}} @actionParam={{backup}} @icon="download" @title="admin.backups.operations.download.title" @label="admin.backups.operations.download.label" />
-            {{#if status.isOperationRunning}}
+            {{#if this.status.isOperationRunning}}
               <DButton @icon="far-trash-alt" @action={{route-action "destroyBackup"}} @actionParam={{backup}} @class="btn-danger" @disabled="true" @title="admin.backups.operations.is_running" />
-              <DButton @icon="play" @action={{route-action "startRestore"}} @actionParam={{backup}} @disabled={{status.restoreDisabled}} @class="btn-default" @title={{restoreTitle}} @label="admin.backups.operations.restore.label" />
+              <DButton @icon="play" @action={{route-action "startRestore"}} @actionParam={{backup}} @disabled={{this.status.restoreDisabled}} @class="btn-default" @title={{this.restoreTitle}} @label="admin.backups.operations.restore.label" />
             {{else}}
               <DButton @icon="far-trash-alt" @action={{route-action "destroyBackup"}} @actionParam={{backup}} @class="btn-danger" @title="admin.backups.operations.destroy.title" />
-              <DButton @icon="play" @action={{route-action "startRestore"}} @actionParam={{backup}} @disabled={{status.restoreDisabled}} @class="btn-default btn-restore" @title={{restoreTitle}} @label="admin.backups.operations.restore.label" />
+              <DButton @icon="play" @action={{route-action "startRestore"}} @actionParam={{backup}} @disabled={{this.status.restoreDisabled}} @class="btn-default btn-restore" @title={{this.restoreTitle}} @label="admin.backups.operations.restore.label" />
             {{/if}}
           </div>
         </td>
diff --git a/app/assets/javascripts/admin/addon/templates/backups-logs.hbs b/app/assets/javascripts/admin/addon/templates/backups-logs.hbs
index 1f4a77418d0..88ee8f9ec5f 100644
--- a/app/assets/javascripts/admin/addon/templates/backups-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups-logs.hbs
@@ -1 +1 @@
-<AdminBackupsLogs @logs={{logs}} @status={{status}} />
+<AdminBackupsLogs @logs={{this.logs}} @status={{this.status}} />
diff --git a/app/assets/javascripts/admin/addon/templates/backups.hbs b/app/assets/javascripts/admin/addon/templates/backups.hbs
index ca33af1c50c..baeed297482 100644
--- a/app/assets/javascripts/admin/addon/templates/backups.hbs
+++ b/app/assets/javascripts/admin/addon/templates/backups.hbs
@@ -6,10 +6,10 @@
         <NavItem @route="admin.backups.logs" @label="admin.backups.menu.logs" />
         <PluginOutlet @name="downloader" @connectorTagName="div" />
         <div class="admin-actions">
-          {{#if model.canRollback}}
-            <DButton @action={{route-action "rollback"}} @class="btn-default btn-rollback" @label="admin.backups.operations.rollback.label" @title="admin.backups.operations.rollback.title" @icon="ambulance" @disabled={{rollbackDisabled}} />
+          {{#if this.model.canRollback}}
+            <DButton @action={{route-action "rollback"}} @class="btn-default btn-rollback" @label="admin.backups.operations.rollback.label" @title="admin.backups.operations.rollback.title" @icon="ambulance" @disabled={{this.rollbackDisabled}} />
           {{/if}}
-          {{#if model.isOperationRunning}}
+          {{#if this.model.isOperationRunning}}
             <DButton @action={{route-action "cancelOperation"}} @class="btn-danger" @title="admin.backups.operations.cancel.title" @label="admin.backups.operations.cancel.label" @icon="times" />
           {{else}}
             <DButton @action={{route-action "showStartBackupModal"}} @class="btn-primary" @title="admin.backups.operations.backup.title" @label="admin.backups.operations.backup.label" @icon="rocket" />
diff --git a/app/assets/javascripts/admin/addon/templates/badges-award.hbs b/app/assets/javascripts/admin/addon/templates/badges-award.hbs
index b91297be450..a18133d2ec4 100644
--- a/app/assets/javascripts/admin/addon/templates/badges-award.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges-award.hbs
@@ -2,12 +2,12 @@
   <h1>{{i18n "admin.badges.mass_award.title"}}</h1>
   <p>{{i18n "admin.badges.mass_award.description"}}</p>
 
-  {{#if model}}
+  {{#if this.model}}
     <form class="form-horizontal">
       <div class="badge-preview control-group">
-        {{#if model}}
-          {{icon-or-image model}}
-          <span class="badge-display-name">{{model.name}}</span>
+        {{#if this.model}}
+          {{icon-or-image this.model}}
+          <span class="badge-display-name">{{this.model.name}}</span>
         {{else}}
           <span class="badge-placeholder">{{i18n "admin.badges.mass_award.no_badge_selected"}}</span>
         {{/if}}
@@ -18,47 +18,47 @@
       </div>
       <div class="control-group">
         <label>
-          <Input @type="checkbox" @checked={{replaceBadgeOwners}} />
+          <Input @type="checkbox" @checked={{this.replaceBadgeOwners}} />
           {{i18n "admin.badges.mass_award.replace_owners"}}
         </label>
-        {{#if model.multiple_grant}}
+        {{#if this.model.multiple_grant}}
           <label class="grant-existing-holders">
-            <Input @type="checkbox" @checked={{grantExistingHolders}} class="grant-existing-holders-checkbox" />
+            <Input @type="checkbox" @checked={{this.grantExistingHolders}} class="grant-existing-holders-checkbox" />
             {{i18n "admin.badges.mass_award.grant_existing_holders"}}
           </label>
         {{/if}}
       </div>
-      <DButton @class="btn-primary" @action={{action "massAward"}} @type="submit" @disabled={{massAwardButtonDisabled}} @icon="certificate" @label="admin.badges.mass_award.perform" />
+      <DButton @class="btn-primary" @action={{action "massAward"}} @type="submit" @disabled={{this.massAwardButtonDisabled}} @icon="certificate" @label="admin.badges.mass_award.perform" />
       <LinkTo @route="adminBadges.index" class="btn btn-normal">
         {{d-icon "times"}}
         <span>{{i18n "cancel"}}</span>
       </LinkTo>
     </form>
-    {{#if saving}}
+    {{#if this.saving}}
       {{i18n "uploading"}}
     {{/if}}
-    {{#if resultsMessage}}
+    {{#if this.resultsMessage}}
       <p>
-        {{#if success}}
+        {{#if this.success}}
           {{d-icon "check" class="bulk-award-status-icon success"}}
         {{else}}
           {{d-icon "times" class="bulk-award-status-icon failure"}}
         {{/if}}
-        {{resultsMessage}}
+        {{this.resultsMessage}}
       </p>
-      {{#if unmatchedEntries.length}}
+      {{#if this.unmatchedEntries.length}}
         <p>
           {{d-icon "exclamation-triangle" class="bulk-award-status-icon failure"}}
           <span>
-            {{#if unmatchedEntriesTruncated}}
-              {{i18n "admin.badges.mass_award.csv_has_unmatched_users_truncated_list" count=unmatchedEntriesCount}}
+            {{#if this.unmatchedEntriesTruncated}}
+              {{i18n "admin.badges.mass_award.csv_has_unmatched_users_truncated_list" count=this.unmatchedEntriesCount}}
             {{else}}
               {{i18n "admin.badges.mass_award.csv_has_unmatched_users"}}
             {{/if}}
           </span>
         </p>
         <ul>
-          {{#each unmatchedEntries as |entry|}}
+          {{#each this.unmatchedEntries as |entry|}}
             <li>{{entry}}</li>
           {{/each}}
         </ul>
diff --git a/app/assets/javascripts/admin/addon/templates/badges-index.hbs b/app/assets/javascripts/admin/addon/templates/badges-index.hbs
index 240428ab45f..9e2b04e2a04 100644
--- a/app/assets/javascripts/admin/addon/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges-index.hbs
@@ -1,10 +1,10 @@
 <DSection @class="current-badges">
   <div class="badge-intro admin-intro">
-    <img src={{badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n "admin.badges.badge_intro.emoji"}}>
+    <img src={{this.badgeIntroEmoji}} class="badge-intro-emoji" alt={{i18n "admin.badges.badge_intro.emoji"}}>
     <div class="content-wrapper">
       <h1>{{i18n "admin.badges.badge_intro.title"}}</h1>
       <div class="external-resources">
-        {{#each badgeIntroLinks as |link|}}
+        {{#each this.badgeIntroLinks as |link|}}
           <a href={{link.href}} class="external-link" target="_blank" rel="noopener noreferrer">
             {{d-icon link.icon}}
             <span>{{i18n link.text}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/badges-show.hbs b/app/assets/javascripts/admin/addon/templates/badges-show.hbs
index 75e1803afdd..60948580a6b 100644
--- a/app/assets/javascripts/admin/addon/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges-show.hbs
@@ -2,15 +2,15 @@
   <form class="form-horizontal">
     <div class="control-group">
       <label for="name">{{i18n "admin.badges.name"}}</label>
-      {{#if readOnly}}
-        <Input @type="text" @name="name" @value={{buffered.name}} @disabled={{true}} />
+      {{#if this.readOnly}}
+        <Input @type="text" @name="name" @value={{this.buffered.name}} @disabled={{true}} />
         <p class="help">
-          <LinkTo @route="adminSiteText" @query={{hash q=(concat textCustomizationPrefix "name")}}>
+          <LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "name")}}>
             {{i18n "admin.badges.read_only_setting_help"}}
           </LinkTo>
         </p>
       {{else}}
-        <Input @type="text" @name="name" @value={{buffered.name}} />
+        <Input @type="text" @name="name" @value={{this.buffered.name}} />
       {{/if}}
     </div>
 
@@ -18,29 +18,29 @@
       <label for="graphic">{{i18n "admin.badges.graphic"}}</label>
       <div class="radios inline-form full-width">
         <label class="radio-label" for="badge-icon">
-          <RadioButton @name="badge-icon" @id="badge-icon" @value="icon" @selection={{selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
+          <RadioButton @name="badge-icon" @id="badge-icon" @value="icon" @selection={{this.selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
           <span>{{i18n "admin.badges.select_an_icon"}}</span>
         </label>
 
         <label class="radio-label" for="badge-image">
-          <RadioButton @name="badge-image" @id="badge-image" @value="image" @selection={{selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
+          <RadioButton @name="badge-image" @id="badge-image" @value="image" @selection={{this.selectedGraphicType}} @onChange={{action "changeGraphicType"}} />
           <span>{{i18n "admin.badges.upload_an_image"}}</span>
         </label>
       </div>
-      {{#if imageUploaderSelected}}
-        <UppyImageUploader @id="badge-image-uploader" @imageUrl={{buffered.image_url}} @type="badge_image" @onUploadDone={{action "setImage"}} @onUploadDeleted={{action "removeImage"}} @class="no-repeat contain-image" />
+      {{#if this.imageUploaderSelected}}
+        <UppyImageUploader @id="badge-image-uploader" @imageUrl={{this.buffered.image_url}} @type="badge_image" @onUploadDone={{action "setImage"}} @onUploadDeleted={{action "removeImage"}} @class="no-repeat contain-image" />
         <div class="control-instructions">
           <p class="help">{{i18n "admin.badges.image_help"}}</p>
         </div>
-      {{else if iconSelectorSelected}}
-        <IconPicker @name="icon" @value={{buffered.icon}} @options={{hash maximum=1}} @onChange={{action (mut buffered.icon)}} />
+      {{else if this.iconSelectorSelected}}
+        <IconPicker @name="icon" @value={{this.buffered.icon}} @options={{hash maximum=1}} @onChange={{action (mut this.buffered.icon)}} />
       {{/if}}
     </div>
 
     <div class="control-group">
       <label for="badge_type_id">{{i18n "admin.badges.badge_type"}}</label>
-      <ComboBox @name="badge_type_id" @value={{buffered.badge_type_id}} @content={{badgeTypes}} @onChange={{action (mut buffered.badge_type_id)}} @options={{hash
-          disabled=readOnly
+      <ComboBox @name="badge_type_id" @value={{this.buffered.badge_type_id}} @content={{this.badgeTypes}} @onChange={{action (mut this.buffered.badge_type_id)}} @options={{hash
+          disabled=this.readOnly
         }} />
     </div>
 
@@ -48,71 +48,71 @@
       <label for="badge_grouping_id">{{i18n "admin.badges.badge_grouping"}}</label>
 
       <div class="badge-grouping-control">
-        <ComboBox @name="badge_grouping_id" @value={{buffered.badge_grouping_id}} @content={{badgeGroupings}} @class="badge-selector" @nameProperty="name" @onChange={{action (mut buffered.badge_grouping_id)}} />
+        <ComboBox @name="badge_grouping_id" @value={{this.buffered.badge_grouping_id}} @content={{this.badgeGroupings}} @class="badge-selector" @nameProperty="name" @onChange={{action (mut this.buffered.badge_grouping_id)}} />
         <DButton @class="btn-default" @action={{route-action "editGroupings"}} @icon="pencil-alt" />
       </div>
     </div>
 
     <div class="control-group">
       <label for="description">{{i18n "admin.badges.description"}}</label>
-      {{#if buffered.system}}
-        <Textarea @name="description" @value={{buffered.description}} @disabled={{true}} />
+      {{#if this.buffered.system}}
+        <Textarea @name="description" @value={{this.buffered.description}} @disabled={{true}} />
         <p class="help">
-          <LinkTo @route="adminSiteText" @query={{hash q=(concat textCustomizationPrefix "description")}}>
+          <LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "description")}}>
             {{i18n "admin.badges.read_only_setting_help"}}
           </LinkTo>
         </p>
       {{else}}
-        <Textarea @name="description" @value={{buffered.description}} />
+        <Textarea @name="description" @value={{this.buffered.description}} />
       {{/if}}
     </div>
 
     <div class="control-group">
       <label for="long_description">{{i18n "admin.badges.long_description"}}</label>
-      {{#if buffered.system}}
-        <Textarea @name="long_description" @value={{buffered.long_description}} @disabled={{true}} />
+      {{#if this.buffered.system}}
+        <Textarea @name="long_description" @value={{this.buffered.long_description}} @disabled={{true}} />
         <p class="help">
-          <LinkTo @route="adminSiteText" @query={{hash q=(concat textCustomizationPrefix "long_description")}}>
+          <LinkTo @route="adminSiteText" @query={{hash q=(concat this.textCustomizationPrefix "long_description")}}>
             {{i18n "admin.badges.read_only_setting_help"}}
           </LinkTo>
         </p>
       {{else}}
-        <Textarea @name="long_description" @value={{buffered.long_description}} />
+        <Textarea @name="long_description" @value={{this.buffered.long_description}} />
       {{/if}}
     </div>
 
-    {{#if siteSettings.enable_badge_sql}}
+    {{#if this.siteSettings.enable_badge_sql}}
       <div class="control-group">
         <label for="query">{{i18n "admin.badges.query"}}</label>
-        <AceEditor @content={{buffered.query}} @mode="sql" @disabled={{readOnly}} />
+        <AceEditor @content={{this.buffered.query}} @mode="sql" @disabled={{this.readOnly}} />
       </div>
 
-      {{#if hasQuery}}
-        <a href {{action "preview" buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
+      {{#if this.hasQuery}}
+        <a href {{action "preview" this.buffered "false"}}>{{i18n "admin.badges.preview.link_text"}}</a>
         |
-        <a href {{action "preview" buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
-        {{#if preview_loading}}
+        <a href {{action "preview" this.buffered "true"}}>{{i18n "admin.badges.preview.plan_text"}}</a>
+        {{#if this.preview_loading}}
           {{i18n "loading"}}
         {{/if}}
 
         <div class="control-group">
           <label>
-            <Input @type="checkbox" @checked={{buffered.auto_revoke}} @disabled={{readOnly}} />
+            <Input @type="checkbox" @checked={{this.buffered.auto_revoke}} @disabled={{this.readOnly}} />
             {{i18n "admin.badges.auto_revoke"}}
           </label>
         </div>
 
         <div class="control-group">
           <label>
-            <Input @type="checkbox" @checked={{buffered.target_posts}} @disabled={{readOnly}} />
+            <Input @type="checkbox" @checked={{this.buffered.target_posts}} @disabled={{this.readOnly}} />
             {{i18n "admin.badges.target_posts"}}
           </label>
         </div>
 
         <div class="control-group">
           <label for="trigger">{{i18n "admin.badges.trigger"}}</label>
-          <ComboBox @name="trigger" @value={{buffered.trigger}} @content={{badgeTriggers}} @onChange={{action (mut buffered.trigger)}} @options={{hash
-              disabled=readOnly
+          <ComboBox @name="trigger" @value={{this.buffered.trigger}} @content={{this.badgeTriggers}} @onChange={{action (mut this.buffered.trigger)}} @options={{hash
+              disabled=this.readOnly
             }} />
         </div>
       {{/if}}
@@ -121,54 +121,54 @@
     <div class="control-group">
       <div>
         <label>
-          <Input @type="checkbox" @checked={{buffered.allow_title}} />
+          <Input @type="checkbox" @checked={{this.buffered.allow_title}} />
           {{i18n "admin.badges.allow_title"}}
         </label>
       </div>
 
       <div>
         <label>
-          <Input @type="checkbox" @checked={{buffered.multiple_grant}} @disabled={{readOnly}} />
+          <Input @type="checkbox" @checked={{this.buffered.multiple_grant}} @disabled={{this.readOnly}} />
           {{i18n "admin.badges.multiple_grant"}}
         </label>
       </div>
 
       <div>
         <label>
-          <Input @type="checkbox" @checked={{buffered.listable}} @disabled={{readOnly}} />
+          <Input @type="checkbox" @checked={{this.buffered.listable}} @disabled={{this.readOnly}} />
           {{i18n "admin.badges.listable"}}
         </label>
       </div>
 
       <div>
         <label>
-          <Input @type="checkbox" @checked={{buffered.show_posts}} @disabled={{readOnly}} />
+          <Input @type="checkbox" @checked={{this.buffered.show_posts}} @disabled={{this.readOnly}} />
           {{i18n "admin.badges.show_posts"}}
         </label>
       </div>
 
       <div>
         <label>
-          <Input @type="checkbox" @checked={{buffered.enabled}} />
+          <Input @type="checkbox" @checked={{this.buffered.enabled}} />
           {{i18n "admin.badges.enabled"}}
         </label>
       </div>
     </div>
 
     <div class="buttons">
-      <DButton @class="btn-primary" @action={{action "save"}} @type="submit" @disabled={{saving}} @label="admin.badges.save" />
-      <span class="saving">{{savingStatus}}</span>
-      {{#unless readOnly}}
+      <DButton @class="btn-primary" @action={{action "save"}} @type="submit" @disabled={{this.saving}} @label="admin.badges.save" />
+      <span class="saving">{{this.savingStatus}}</span>
+      {{#unless this.readOnly}}
         <DButton @action={{action "destroy"}} @class="btn-danger" @label="admin.badges.delete" />
       {{/unless}}
     </div>
   </form>
 </DSection>
 
-{{#if grant_count}}
+{{#if this.grant_count}}
   <div class="content-body current-badge-actions">
     <div>
-      <LinkTo @route="badges.show" @model={{this}}>{{i18n "badges.granted" count=grant_count}}</LinkTo>
+      <LinkTo @route="badges.show" @model={{this}}>{{i18n "badges.granted" count=this.grant_count}}</LinkTo>
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/badges.hbs b/app/assets/javascripts/admin/addon/templates/badges.hbs
index 37d09891067..08237156426 100644
--- a/app/assets/javascripts/admin/addon/templates/badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/badges.hbs
@@ -15,9 +15,9 @@
   </div>
   <div class="content-list">
     <ul class="admin-badge-list">
-      {{#each model as |badge|}}
+      {{#each this.model as |badge|}}
         <li class="admin-badge-list-item">
-          <LinkTo @route={{selectedRoute}} @model={{badge.id}}>
+          <LinkTo @route={{this.selectedRoute}} @model={{badge.id}}>
             <BadgeButton @badge={{badge}} />
             {{#if badge.newBadge}}
               <span class="list-badge">{{i18n "filters.new.lower_title"}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs
index b5e30e53238..64421d44ca9 100644
--- a/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/ace-editor.hbs
@@ -1 +1 @@
-<div class="ace">{{content}}</div>
+<div class="ace">{{this.content}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs
index 532185386b4..38129ed3906 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-backups-logs.hbs
@@ -1,8 +1,8 @@
-{{#if hasFormattedLogs}}
-  <pre>{{formattedLogs}}</pre>
+{{#if this.hasFormattedLogs}}
+  <pre>{{this.formattedLogs}}</pre>
 {{else}}
-  <p>{{noLogsMessage}}</p>
+  <p>{{this.noLogsMessage}}</p>
 {{/if}}
-{{#if showLoadingSpinner}}
+{{#if this.showLoadingSpinner}}
   <div class="spinner small"></div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
index c9617670f17..d62cfdbd783 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-editable-field.hbs
@@ -1,15 +1,15 @@
-<div class="field">{{i18n name}}</div>
+<div class="field">{{i18n this.name}}</div>
 <div class="value">
-  {{#if editing}}
-    <TextField @value={{buffer}} @autofocus="autofocus" @autocomplete="off" />
+  {{#if this.editing}}
+    <TextField @value={{this.buffer}} @autofocus="autofocus" @autocomplete="off" />
   {{else}}
     <a href {{action "edit"}} class="inline-editable-field">
-      <span>{{value}}</span>
+      <span>{{this.value}}</span>
     </a>
   {{/if}}
 </div>
 <div class="controls">
-  {{#if editing}}
+  {{#if this.editing}}
     <DButton @class="btn-default" @action={{action "save"}} @label="admin.user_fields.save" />
     <a href {{action "edit"}}>{{i18n "cancel"}}</a>
   {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs
index 4d1163f95e5..e7644965f1d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-form-row.hbs
@@ -1,12 +1,12 @@
 <div class="form-element label-area">
-  {{#if label}}
-    <label>{{i18n label}}</label>
+  {{#if this.label}}
+    <label>{{i18n this.label}}</label>
   {{else}}
     &nbsp;
   {{/if}}
 </div>
 <div class="form-element input-area">
-  {{#if wrapLabel}}
+  {{#if this.wrapLabel}}
     <label>{{yield}}</label>
   {{else}}
     {{yield}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs
index 6c622714acf..3720e501b6d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-penalty-history.hbs
@@ -1,8 +1,8 @@
-<div class="suspended-count {{suspendedCountClass}}" title={{i18n "admin.user.last_six_months"}}>
+<div class="suspended-count {{this.suspendedCountClass}}" title={{i18n "admin.user.last_six_months"}}>
   <label>{{i18n "admin.user.suspended_count"}}</label>
-  <span>{{user.penalty_counts.suspended}}</span>
+  <span>{{this.user.penalty_counts.suspended}}</span>
 </div>
-<div class="silenced-count {{silencedCountClass}}" title={{i18n "admin.user.last_six_months"}}>
+<div class="silenced-count {{this.silencedCountClass}}" title={{i18n "admin.user.last_six_months"}}>
   <label>{{i18n "admin.user.silenced_count"}}</label>
-  <span>{{user.penalty_counts.silenced}}</span>
+  <span>{{this.user.penalty_counts.silenced}}</span>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs
index b411a2571b2..c5ee801a87d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-counters.hbs
@@ -1,24 +1,24 @@
 <div class="cell title">
-  {{#if model.icon}}
-    {{d-icon model.icon}}
+  {{#if this.model.icon}}
+    {{d-icon this.model.icon}}
   {{/if}}
-  <a href={{model.reportUrl}}>{{model.title}}</a>
+  <a href={{this.model.reportUrl}}>{{this.model.title}}</a>
 </div>
 
-<div class="cell value today-count">{{number model.todayCount}}</div>
+<div class="cell value today-count">{{number this.model.todayCount}}</div>
 
-<div class="cell value yesterday-count {{model.yesterdayTrend}}" title={{model.yesterdayCountTitle}}>
-  {{number model.yesterdayCount}} {{d-icon model.yesterdayTrendIcon}}
+<div class="cell value yesterday-count {{this.model.yesterdayTrend}}" title={{this.model.yesterdayCountTitle}}>
+  {{number this.model.yesterdayCount}} {{d-icon this.model.yesterdayTrendIcon}}
 </div>
 
-<div class="cell value sevendays-count {{model.sevenDaysTrend}}" title={{model.sevenDaysCountTitle}}>
-  {{number model.lastSevenDaysCount}} {{d-icon model.sevenDaysTrendIcon}}
+<div class="cell value sevendays-count {{this.model.sevenDaysTrend}}" title={{this.model.sevenDaysCountTitle}}>
+  {{number this.model.lastSevenDaysCount}} {{d-icon this.model.sevenDaysTrendIcon}}
 </div>
 
-<div class="cell value thirty-days-count {{model.thirtyDaysTrend}}" title={{model.thirtyDaysCountTitle}}>
-  {{number model.lastThirtyDaysCount}}
+<div class="cell value thirty-days-count {{this.model.thirtyDaysTrend}}" title={{this.model.thirtyDaysCountTitle}}>
+  {{number this.model.lastThirtyDaysCount}}
 
-  {{#if model.canDisplayTrendIcon}}
-    {{d-icon model.thirtyDaysTrendIcon}}
+  {{#if this.model.canDisplayTrendIcon}}
+    {{d-icon this.model.thirtyDaysTrendIcon}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs
index a1e64441f9e..dd3719115a8 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-counts.hbs
@@ -1,24 +1,24 @@
 <td class="title">
-  {{#if report.icon}}
-    {{d-icon report.icon}}
+  {{#if this.report.icon}}
+    {{d-icon this.report.icon}}
   {{/if}}
-  <a href={{report.reportUrl}}>{{report.title}}</a>
+  <a href={{this.report.reportUrl}}>{{this.report.title}}</a>
 </td>
 
-<td class="value">{{number report.todayCount}}</td>
+<td class="value">{{number this.report.todayCount}}</td>
 
-<td class="value {{report.yesterdayTrend}}" title={{report.yesterdayCountTitle}}>
-  {{number report.yesterdayCount}} {{d-icon report.yesterdayTrendIcon}}
+<td class="value {{this.report.yesterdayTrend}}" title={{this.report.yesterdayCountTitle}}>
+  {{number this.report.yesterdayCount}} {{d-icon this.report.yesterdayTrendIcon}}
 </td>
 
-<td class="value {{report.sevenDaysTrend}}" title={{report.sevenDaysCountTitle}}>
-  {{number report.lastSevenDaysCount}} {{d-icon report.sevenDaysTrendIcon}}
+<td class="value {{this.report.sevenDaysTrend}}" title={{this.report.sevenDaysCountTitle}}>
+  {{number this.report.lastSevenDaysCount}} {{d-icon this.report.sevenDaysTrendIcon}}
 </td>
 
-<td class="value {{report.thirtyDaysTrend}}" title={{report.thirtyDaysCountTitle}}>
-  {{number report.lastThirtyDaysCount}} {{d-icon report.thirtyDaysTrendIcon}}
+<td class="value {{this.report.thirtyDaysTrend}}" title={{this.report.thirtyDaysCountTitle}}>
+  {{number this.report.lastThirtyDaysCount}} {{d-icon this.report.thirtyDaysTrendIcon}}
 </td>
 
-{{#if allTime}}
-  <td class="value">{{number report.total}}</td>
+{{#if this.allTime}}
+  <td class="value">{{number this.report.total}}</td>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs
index 9b7f797d036..e44b96d3de3 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-inline-table.hbs
@@ -1,5 +1,5 @@
 <div class="table-container">
-  {{#each model.data as |data|}}
+  {{#each this.model.data as |data|}}
     <a class="table-cell user-{{data.key}}" href={{data.url}}>
       <span class="label">
         {{#if data.icon}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs
index e16bd42f50e..c8d6ce07fde 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-per-day-counts.hbs
@@ -1,6 +1,6 @@
-<td class="title"><a href={{report.reportUrl}}>{{report.title}}</a></td>
-<td class="value">{{report.todayCount}}</td>
-<td class="value">{{report.yesterdayCount}}</td>
-<td class="value">{{report.sevenDaysAgoCount}}</td>
-<td class="value">{{report.thirtyDaysAgoCount}}</td>
+<td class="title"><a href={{this.report.reportUrl}}>{{this.report.title}}</a></td>
+<td class="value">{{this.report.todayCount}}</td>
+<td class="value">{{this.report.yesterdayCount}}</td>
+<td class="value">{{this.report.sevenDaysAgoCount}}</td>
+<td class="value">{{this.report.thirtyDaysAgoCount}}</td>
 <td class="value"></td>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs
index 9a8986e9e6e..645377a1683 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-storage-stats.hbs
@@ -1,21 +1,21 @@
-{{#if showBackupStats}}
+{{#if this.showBackupStats}}
   <div class="backups">
     <h3 class="storage-stats-title">
       <a href={{get-url "/admin/backups"}}>{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
     </h3>
     <p>
-      {{#if backupStats.free_bytes}}
-        {{i18n "admin.dashboard.space_used_and_free" usedSize=usedBackupSpace freeSize=freeBackupSpace}}
+      {{#if this.backupStats.free_bytes}}
+        {{i18n "admin.dashboard.space_used_and_free" usedSize=this.usedBackupSpace freeSize=this.freeBackupSpace}}
       {{else}}
-        {{i18n "admin.dashboard.space_used" usedSize=usedBackupSpace}}
+        {{i18n "admin.dashboard.space_used" usedSize=this.usedBackupSpace}}
       {{/if}}
 
       <br>
-      {{i18n "admin.dashboard.backup_count" count=backupStats.count location=backupLocationName}}
+      {{i18n "admin.dashboard.backup_count" count=this.backupStats.count location=this.backupLocationName}}
 
-      {{#if backupStats.last_backup_taken_at}}
+      {{#if this.backupStats.last_backup_taken_at}}
         <br>
-        {{html-safe (i18n "admin.dashboard.lastest_backup" date=(format-date backupStats.last_backup_taken_at leaveAgo="true"))}}
+        {{html-safe (i18n "admin.dashboard.lastest_backup" date=(format-date this.backupStats.last_backup_taken_at leaveAgo="true"))}}
       {{/if}}
     </p>
   </div>
@@ -24,10 +24,10 @@
 <div class="uploads">
   <h3 class="storage-stats-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
   <p>
-    {{#if uploadStats.free_bytes}}
-      {{i18n "admin.dashboard.space_used_and_free" usedSize=usedUploadSpace freeSize=freeUploadSpace}}
+    {{#if this.uploadStats.free_bytes}}
+      {{i18n "admin.dashboard.space_used_and_free" usedSize=this.usedUploadSpace freeSize=this.freeUploadSpace}}
     {{else}}
-      {{i18n "admin.dashboard.space_used" usedSize=usedUploadSpace}}
+      {{i18n "admin.dashboard.space_used" usedSize=this.usedUploadSpace}}
     {{/if}}
   </p>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs
index ab2a766612d..df82cb6663b 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-cell.hbs
@@ -1 +1 @@
-{{html-safe formattedValue}}
+{{html-safe this.formattedValue}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
index 02d8da84444..7698c30d431 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-header.hbs
@@ -1,9 +1,9 @@
-{{#if showSortingUI}}
-  <DButton @action={{sortByLabel}} @icon={{sortIcon}} @class="sort-btn" />
+{{#if this.showSortingUI}}
+  <DButton @action={{this.sortByLabel}} @icon={{this.sortIcon}} @class="sort-btn" />
 {{/if}}
 
-{{#if label.htmlTitle}}
-  <span class="title">{{html-safe label.htmlTitle}}</span>
+{{#if this.label.htmlTitle}}
+  <span class="title">{{html-safe this.label.htmlTitle}}</span>
 {{else}}
-  <span class="title">{{label.title}}</span>
+  <span class="title">{{this.label.title}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs
index 7a5c52a88df..7cf1645eac1 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-table-row.hbs
@@ -1,3 +1,3 @@
-{{#each labels as |label|}}
-  <AdminReportTableCell @label={{label}} @data={{data}} @options={{options}} />
+{{#each this.labels as |label|}}
+  <AdminReportTableCell @label={{label}} @data={{this.data}} @options={{this.options}} />
 {{/each}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs
index 5b6f6724d23..ada5f1c4b54 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-table.hbs
@@ -1,30 +1,30 @@
 <table class="table">
   <thead>
     <tr>
-      {{#if model.computedLabels}}
-        {{#each model.computedLabels as |label|}}
-          <AdminReportTableHeader @showSortingUI={{showSortingUI}} @currentSortDirection={{sortDirection}} @currentSortLabel={{sortLabel}} @label={{label}} @sortByLabel={{action "sortByLabel" label}} />
+      {{#if this.model.computedLabels}}
+        {{#each this.model.computedLabels as |label|}}
+          <AdminReportTableHeader @showSortingUI={{this.showSortingUI}} @currentSortDirection={{this.sortDirection}} @currentSortLabel={{this.sortLabel}} @label={{label}} @sortByLabel={{action "sortByLabel" label}} />
         {{/each}}
       {{else}}
-        {{#each model.data as |data|}}
+        {{#each this.model.data as |data|}}
           <th>{{data.x}}</th>
         {{/each}}
       {{/if}}
     </tr>
   </thead>
   <tbody>
-    {{#each paginatedData as |data|}}
-      <AdminReportTableRow @data={{data}} @labels={{model.computedLabels}} @options={{options}} />
+    {{#each this.paginatedData as |data|}}
+      <AdminReportTableRow @data={{data}} @labels={{this.model.computedLabels}} @options={{this.options}} />
     {{/each}}
 
-    {{#if showTotalForSample}}
+    {{#if this.showTotalForSample}}
       <tr class="total-row">
-        <td colspan={{totalsForSample.length}}>
+        <td colspan={{this.totalsForSample.length}}>
           {{i18n "admin.dashboard.reports.totals_for_sample"}}
         </td>
       </tr>
       <tr class="admin-report-table-row">
-        {{#each totalsForSample as |total|}}
+        {{#each this.totalsForSample as |total|}}
           <td class="admin-report-table-cell {{total.type}} {{total.property}}">
             {{total.formattedValue}}
           </td>
@@ -32,7 +32,7 @@
       </tr>
     {{/if}}
 
-    {{#if showTotal}}
+    {{#if this.showTotal}}
       <tr class="total-row">
         <td colspan="2">
           {{i18n "admin.dashboard.reports.total"}}
@@ -40,11 +40,11 @@
       </tr>
       <tr class="admin-report-table-row">
         <td class="admin-report-table-cell date x">—</td>
-        <td class="admin-report-table-cell number y">{{number model.total}}</td>
+        <td class="admin-report-table-cell number y">{{number this.model.total}}</td>
       </tr>
     {{/if}}
 
-    {{#if showAverage}}
+    {{#if this.showAverage}}
       <tr class="total-row">
         <td colspan="2">
           {{i18n "admin.dashboard.reports.average_for_sample"}}
@@ -52,14 +52,14 @@
       </tr>
       <tr class="admin-report-table-row">
         <td class="admin-report-table-cell date x">—</td>
-        <td class="admin-report-table-cell number y">{{number averageForSample}}</td>
+        <td class="admin-report-table-cell number y">{{number this.averageForSample}}</td>
       </tr>
     {{/if}}
   </tbody>
 </table>
 
 <div class="pagination">
-  {{#each pages as |pageState|}}
+  {{#each this.pages as |pageState|}}
     <DButton @translatedLabel={{pageState.page}} @action={{action "changePage"}} @actionParam={{pageState.index}} @class={{pageState.class}} />
   {{/each}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
index be416ab37de..05b10f62895 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
@@ -1,6 +1,6 @@
-<td class="title">{{report.title}}</td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="newuser">{{number (value-at-tl report.data level="0")}}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="basic">{{number (value-at-tl report.data level="1")}}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="member">{{number (value-at-tl report.data level="2")}}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="regular">{{number (value-at-tl report.data level="3")}}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="leader">{{number (value-at-tl report.data level="4")}}</LinkTo></td>
+<td class="title">{{this.report.title}}</td>
+<td class="value"><LinkTo @route="adminUsersList.show" @model="newuser">{{number (value-at-tl this.report.data level="0")}}</LinkTo></td>
+<td class="value"><LinkTo @route="adminUsersList.show" @model="basic">{{number (value-at-tl this.report.data level="1")}}</LinkTo></td>
+<td class="value"><LinkTo @route="adminUsersList.show" @model="member">{{number (value-at-tl this.report.data level="2")}}</LinkTo></td>
+<td class="value"><LinkTo @route="adminUsersList.show" @model="regular">{{number (value-at-tl this.report.data level="3")}}</LinkTo></td>
+<td class="value"><LinkTo @route="adminUsersList.show" @model="leader">{{number (value-at-tl this.report.data level="4")}}</LinkTo></td>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs
index 04036efde43..44c067c465d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report.hbs
@@ -1,35 +1,35 @@
-{{#unless isHidden}}
-  {{#if isEnabled}}
-    <ConditionalLoadingSection @isLoading={{isLoading}}>
-      {{#if showHeader}}
+{{#unless this.isHidden}}
+  {{#if this.isEnabled}}
+    <ConditionalLoadingSection @isLoading={{this.isLoading}}>
+      {{#if this.showHeader}}
         <div class="header">
-          {{#if showTitle}}
+          {{#if this.showTitle}}
             <ul class="breadcrumb">
-              {{#if showAllReportsLink}}
+              {{#if this.showAllReportsLink}}
                 <li class="item all-reports">
                   <LinkTo @route="admin.dashboardReports" class="report-url">
                     {{i18n "admin.dashboard.all_reports"}}
                   </LinkTo>
                 </li>
 
-                {{#unless showNotFoundError}}
+                {{#unless this.showNotFoundError}}
                   <li class="item separator">|</li>
                 {{/unless}}
               {{/if}}
 
-              {{#unless showNotFoundError}}
+              {{#unless this.showNotFoundError}}
                 <li class="item report">
-                  <a href={{model.reportUrl}} class="report-url">
-                    {{model.title}}
+                  <a href={{this.model.reportUrl}} class="report-url">
+                    {{this.model.title}}
                   </a>
 
-                  {{#if model.description}}
-                    {{#if model.description_link}}
-                      <a target="_blank" rel="noopener noreferrer" href={{model.description_link}} class="info" data-tooltip={{model.description}}>
+                  {{#if this.model.description}}
+                    {{#if this.model.description_link}}
+                      <a target="_blank" rel="noopener noreferrer" href={{this.model.description_link}} class="info" data-tooltip={{this.model.description}}>
                         {{d-icon "question-circle"}}
                       </a>
                     {{else}}
-                      <span class="info" data-tooltip={{model.description}}>
+                      <span class="info" data-tooltip={{this.model.description}}>
                         {{d-icon "question-circle"}}
                       </span>
                     {{/if}}
@@ -39,17 +39,17 @@
             </ul>
           {{/if}}
 
-          {{#if shouldDisplayTrend}}
-            <div class="trend {{model.trend}}">
-              <span class="value" title={{model.trendTitle}}>
-                {{#if model.average}}
-                  {{number model.currentAverage}}{{#if model.percent}}%{{/if}}
+          {{#if this.shouldDisplayTrend}}
+            <div class="trend {{this.model.trend}}">
+              <span class="value" title={{this.model.trendTitle}}>
+                {{#if this.model.average}}
+                  {{number this.model.currentAverage}}{{#if this.model.percent}}%{{/if}}
                 {{else}}
-                  {{number model.currentTotal noTitle="true"}}{{#if model.percent}}%{{/if}}
+                  {{number this.model.currentTotal noTitle="true"}}{{#if this.model.percent}}%{{/if}}
                 {{/if}}
 
-                {{#if model.trendIcon}}
-                  {{d-icon model.trendIcon class="icon"}}
+                {{#if this.model.trendIcon}}
+                  {{d-icon this.model.trendIcon class="icon"}}
                 {{/if}}
               </span>
             </div>
@@ -59,50 +59,50 @@
 
       <div class="body">
         <div class="main">
-          {{#if showError}}
-            {{#if showTimeoutError}}
+          {{#if this.showError}}
+            {{#if this.showTimeoutError}}
               <div class="alert alert-error report-alert timeout">
                 {{d-icon "exclamation-triangle"}}
                 <span>{{i18n "admin.dashboard.timeout_error"}}</span>
               </div>
             {{/if}}
 
-            {{#if showExceptionError}}
+            {{#if this.showExceptionError}}
               <div class="alert alert-error report-alert exception">
                 {{d-icon "exclamation-triangle"}}
                 <span>{{i18n "admin.dashboard.exception_error"}}</span>
               </div>
             {{/if}}
 
-            {{#if showNotFoundError}}
+            {{#if this.showNotFoundError}}
               <div class="alert alert-error report-alert not-found">
                 {{d-icon "exclamation-triangle"}}
                 <span>{{i18n "admin.dashboard.not_found_error"}}</span>
               </div>
             {{/if}}
           {{else}}
-            {{#if hasData}}
-              {{#if currentMode}}
-                {{component modeComponent model=model options=options}}
+            {{#if this.hasData}}
+              {{#if this.currentMode}}
+                {{component this.modeComponent model=this.model options=this.options}}
 
-                {{#if model.relatedReport}}
-                  <AdminReport @showFilteringUI={{false}} @dataSourceName={{model.relatedReport.type}} />
+                {{#if this.model.relatedReport}}
+                  <AdminReport @showFilteringUI={{false}} @dataSourceName={{this.model.relatedReport.type}} />
                 {{/if}}
               {{/if}}
             {{else}}
-              {{#if rateLimitationString}}
+              {{#if this.rateLimitationString}}
                 <div class="alert alert-error report-alert rate-limited">
                   {{d-icon "thermometer-three-quarters"}}
-                  <span>{{rateLimitationString}}</span>
+                  <span>{{this.rateLimitationString}}</span>
                 </div>
               {{else}}
                 <div class="alert alert-info report-alert no-data">
                   {{d-icon "chart-pie"}}
-                  {{#if model.reportUrl}}
-                    <a href={{model.reportUrl}} class="report-url">
+                  {{#if this.model.reportUrl}}
+                    <a href={{this.model.reportUrl}} class="report-url">
                       <span>
-                        {{#if model.title}}
-                          {{model.title}} —
+                        {{#if this.model.title}}
+                          {{this.model.title}} —
                         {{/if}}
                         {{i18n "admin.dashboard.reports.no_data"}}
                       </span>
@@ -116,42 +116,42 @@
           {{/if}}
         </div>
 
-        {{#if showFilteringUI}}
+        {{#if this.showFilteringUI}}
           <div class="filters">
-            {{#if showModes}}
+            {{#if this.showModes}}
               <div class="modes">
-                {{#each displayedModes as |displayedMode|}}
+                {{#each this.displayedModes as |displayedMode|}}
                   <DButton @action={{action "onChangeMode"}} @actionParam={{displayedMode.mode}} @class={{displayedMode.cssClass}} @icon={{displayedMode.icon}} />
                 {{/each}}
               </div>
             {{/if}}
 
-            {{#if isChartMode}}
-              {{#if model.average}}
+            {{#if this.isChartMode}}
+              {{#if this.model.average}}
                 <span class="average-chart">
                   {{i18n "admin.dashboard.reports.average_chart_label"}}
                 </span>
               {{/if}}
               <div class="chart-groupings">
-                {{#each chartGroupings as |chartGrouping|}}
+                {{#each this.chartGroupings as |chartGrouping|}}
                   <DButton @label={{chartGrouping.label}} @action={{action "changeGrouping" chartGrouping.id}} @class={{chartGrouping.class}} @disabled={{chartGrouping.disabled}} />
                 {{/each}}
               </div>
             {{/if}}
 
-            {{#if showDatesOptions}}
+            {{#if this.showDatesOptions}}
               <div class="control">
                 <span class="label">
                   {{i18n "admin.dashboard.reports.dates"}}
                 </span>
 
                 <div class="input">
-                  <DateTimeInputRange @from={{startDate}} @to={{endDate}} @onChange={{action "onChangeDateRange"}} @showFromTime={{false}} @showToTime={{false}} />
+                  <DateTimeInputRange @from={{this.startDate}} @to={{this.endDate}} @onChange={{action "onChangeDateRange"}} @showFromTime={{false}} @showToTime={{false}} />
                 </div>
               </div>
             {{/if}}
 
-            {{#each model.available_filters as |filter|}}
+            {{#each this.model.available_filters as |filter|}}
               <div class="control">
                 <span class="label">
                   {{i18n (concat "admin.dashboard.reports.filters." filter.id ".label")}}
@@ -160,7 +160,7 @@
                 <div class="input">
                   {{component
                     (concat "report-filters/" filter.type)
-                    model=model
+                    model=this.model
                     filter=filter
                     applyFilter=(action "applyFilter")}}
                 </div>
@@ -173,7 +173,7 @@
               </div>
             </div>
 
-            {{#if showRefresh}}
+            {{#if this.showRefresh}}
               <div class="control">
                 <div class="input">
                   <DButton @class="refresh-report-btn btn-primary" @action={{action "refreshReport"}} @label="admin.dashboard.reports.refresh_report" @icon="sync" />
@@ -186,7 +186,7 @@
     </ConditionalLoadingSection>
   {{else}}
     <div class="alert alert-info">
-      {{html-safe disabledLabel}}
+      {{html-safe this.disabledLabel}}
     </div>
   {{/if}}
 {{/unless}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
index f9f923cde0a..fa9f5d153e6 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-theme-editor.hbs
@@ -1,9 +1,9 @@
 <div class="edit-main-nav admin-controls">
   <nav>
     <ul class="nav nav-pills target">
-      {{#each visibleTargets as |target|}}
+      {{#each this.visibleTargets as |target|}}
         <li>
-          <LinkTo @route={{editRouteName}} @models={{array theme.id target.name fieldName}} @replace={{true}} @title={{field.title}} class={{if target.edited "edited" "blank"}}>
+          <LinkTo @route={{this.editRouteName}} @models={{array this.theme.id target.name this.fieldName}} @replace={{true}} @title={{this.field.title}} class={{if target.edited "edited" "blank"}}>
             {{#if target.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if target.icon}}{{d-icon target.icon}}{{/if}}
             {{i18n (concat "admin.customize.theme." target.name)}}
@@ -11,20 +11,20 @@
         </li>
       {{/each}}
 
-      {{#if allowAdvanced}}
+      {{#if this.allowAdvanced}}
         <li>
           <a {{action "toggleShowAdvanced"}}
             href
-            title={{i18n (concat "admin.customize.theme." (if showAdvanced "hide_advanced" "show_advanced"))}}
+            title={{i18n (concat "admin.customize.theme." (if this.showAdvanced "hide_advanced" "show_advanced"))}}
             class="no-text">
-            {{d-icon (if showAdvanced "angle-double-left" "angle-double-right")}}
+            {{d-icon (if this.showAdvanced "angle-double-left" "angle-double-right")}}
           </a>
         </li>
       {{/if}}
       <li class="spacer"></li>
       <li>
         <label>
-          <Input @type="checkbox" @checked={{onlyOverridden}} @click={{action "onlyOverriddenChanged" value="target.checked"}} />
+          <Input @type="checkbox" @checked={{this.onlyOverridden}} @click={{action "onlyOverriddenChanged" value="target.checked"}} />
           {{i18n "admin.customize.theme.hide_unused_fields"}}
         </label>
       </li>
@@ -35,9 +35,9 @@
 <div class="admin-controls">
   <nav>
     <ul class="nav nav-pills fields">
-      {{#each visibleFields as |field|}}
+      {{#each this.visibleFields as |field|}}
         <li>
-          <LinkTo @route={{editRouteName}} @models={{array theme.id currentTargetName field.name}} @replace={{true}} @title={{field.title}} class={{if field.edited "edited" "blank"}}>
+          <LinkTo @route={{this.editRouteName}} @models={{array this.theme.id this.currentTargetName field.name}} @replace={{true}} @title={{field.title}} class={{if field.edited "edited" "blank"}}>
             {{#if field.error}}{{d-icon "exclamation-triangle"}}{{/if}}
             {{#if field.icon}}{{d-icon field.icon}}{{/if}}
             {{field.translatedName}}
@@ -45,14 +45,14 @@
         </li>
       {{/each}}
 
-      {{#if showAddField}}
+      {{#if this.showAddField}}
         <li>
-          {{#if addingField}}
-            <Input @type={{text}} @value={{newFieldName}} @enter={{action "addField"}} @escape-press={{action "cancelAddField"}} />
-            <DButton @class="ok" @action={{action "addField" newFieldName}} @icon="check" />
+          {{#if this.addingField}}
+            <Input @type={{this.text}} @value={{this.newFieldName}} @enter={{action "addField"}} @escape-press={{action "cancelAddField"}} />
+            <DButton @class="ok" @action={{action "addField" this.newFieldName}} @icon="check" />
             <DButton @class="cancel" @action={{action "cancelAddField"}} @icon="times" />
           {{else}}
-            <a href {{action "toggleAddField" currentTargetName}} class="no-text">
+            <a href {{action "toggleAddField" this.currentTargetName}} class="no-text">
               {{d-icon "plus"}}
             </a>
           {{/if}}
@@ -62,19 +62,19 @@
       <li class="spacer"></li>
       <li>
         <a href {{action "toggleMaximize"}} class="no-text">
-          {{d-icon maximizeIcon}}
+          {{d-icon this.maximizeIcon}}
         </a>
       </li>
     </ul>
   </nav>
 </div>
 
-{{#if error}}
-  <pre class="field-error">{{error}}</pre>
+{{#if this.error}}
+  <pre class="field-error">{{this.error}}</pre>
 {{/if}}
 
-{{#if warning}}
-  <pre class="field-warning">{{html-safe warning}}</pre>
+{{#if this.warning}}
+  <pre class="field-warning">{{html-safe this.warning}}</pre>
 {{/if}}
 
-<AceEditor @content={{activeSection}} @editorId={{editorId}} @mode={{activeSectionMode}} @autofocus="true" @placeholder={{placeholder}} @htmlPlaceholder={{true}} @save={{action "save"}} @setWarning={{action "setWarning"}} />
+<AceEditor @content={{this.activeSection}} @editorId={{this.editorId}} @mode={{this.activeSectionMode}} @autofocus="true" @placeholder={{this.placeholder}} @htmlPlaceholder={{true}} @save={{action "save"}} @setWarning={{action "setWarning"}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
index 78535773269..62421021513 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-user-field-item.hbs
@@ -1,41 +1,41 @@
 <div class="user-field">
-  {{#if (or isEditing (not userField.id))}}
+  {{#if (or this.isEditing (not this.userField.id))}}
     <AdminFormRow @label="admin.user_fields.type">
-      <ComboBox @content={{fieldTypes}} @value={{buffered.field_type}} @onChange={{action (mut buffered.field_type)}} />
+      <ComboBox @content={{this.fieldTypes}} @value={{this.buffered.field_type}} @onChange={{action (mut this.buffered.field_type)}} />
     </AdminFormRow>
 
     <AdminFormRow @label="admin.user_fields.name">
-      <Input @value={{buffered.name}} class="user-field-name" @maxlength="255" />
+      <Input @value={{this.buffered.name}} class="user-field-name" @maxlength="255" />
     </AdminFormRow>
 
     <AdminFormRow @label="admin.user_fields.description">
-      <Input @value={{buffered.description}} class="user-field-desc" @maxlength="255" />
+      <Input @value={{this.buffered.description}} class="user-field-desc" @maxlength="255" />
     </AdminFormRow>
 
-    {{#if bufferedFieldType.hasOptions}}
+    {{#if this.bufferedFieldType.hasOptions}}
       <AdminFormRow @label="admin.user_fields.options">
-        <ValueList @values={{buffered.options}} @inputType="array" />
+        <ValueList @values={{this.buffered.options}} @inputType="array" />
       </AdminFormRow>
     {{/if}}
 
     <AdminFormRow @wrapLabel="true">
-      <Input @type="checkbox" @checked={{buffered.editable}} /> <span>{{i18n "admin.user_fields.editable.title"}}</span>
+      <Input @type="checkbox" @checked={{this.buffered.editable}} /> <span>{{i18n "admin.user_fields.editable.title"}}</span>
     </AdminFormRow>
 
     <AdminFormRow @wrapLabel="true">
-      <Input @type="checkbox" @checked={{buffered.required}} /> <span>{{i18n "admin.user_fields.required.title"}}</span>
+      <Input @type="checkbox" @checked={{this.buffered.required}} /> <span>{{i18n "admin.user_fields.required.title"}}</span>
     </AdminFormRow>
 
     <AdminFormRow @wrapLabel="true">
-      <Input @type="checkbox" @checked={{buffered.show_on_profile}} /> <span>{{i18n "admin.user_fields.show_on_profile.title"}}</span>
+      <Input @type="checkbox" @checked={{this.buffered.show_on_profile}} /> <span>{{i18n "admin.user_fields.show_on_profile.title"}}</span>
     </AdminFormRow>
 
     <AdminFormRow @wrapLabel="true">
-      <Input @type="checkbox" @checked={{buffered.show_on_user_card}} /> <span>{{i18n "admin.user_fields.show_on_user_card.title"}}</span>
+      <Input @type="checkbox" @checked={{this.buffered.show_on_user_card}} /> <span>{{i18n "admin.user_fields.show_on_user_card.title"}}</span>
     </AdminFormRow>
 
     <AdminFormRow @wrapLabel="true">
-      <Input @type="checkbox" @checked={{buffered.searchable}} /> <span>{{i18n "admin.user_fields.searchable.title"}}</span>
+      <Input @type="checkbox" @checked={{this.buffered.searchable}} /> <span>{{i18n "admin.user_fields.searchable.title"}}</span>
     </AdminFormRow>
 
     <AdminFormRow>
@@ -45,18 +45,18 @@
   {{else}}
     <div class="row">
       <div class="form-display">
-        <b class="name">{{userField.name}}</b>
+        <b class="name">{{this.userField.name}}</b>
         <br>
-        <span class="description">{{html-safe userField.description}}</span>
+        <span class="description">{{html-safe this.userField.description}}</span>
       </div>
-      <div class="form-display field-type">{{fieldName}}</div>
+      <div class="form-display field-type">{{this.fieldName}}</div>
       <div class="form-element controls">
         <DButton @action={{action "edit"}} @class="btn-default edit" @icon="pencil-alt" @label="admin.user_fields.edit" />
-        <DButton @action={{destroyAction}} @actionParam={{userField}} @class="btn-danger cancel" @icon="far-trash-alt" @label="admin.user_fields.delete" />
-        <DButton @action={{moveUpAction}} @actionParam={{userField}} @class="btn-default" @icon="arrow-up" @disabled={{cantMoveUp}} />
-        <DButton @action={{moveDownAction}} @actionParam={{userField}} @class="btn-default" @icon="arrow-down" @disabled={{cantMoveDown}} />
+        <DButton @action={{this.destroyAction}} @actionParam={{this.userField}} @class="btn-danger cancel" @icon="far-trash-alt" @label="admin.user_fields.delete" />
+        <DButton @action={{this.moveUpAction}} @actionParam={{this.userField}} @class="btn-default" @icon="arrow-up" @disabled={{this.cantMoveUp}} />
+        <DButton @action={{this.moveDownAction}} @actionParam={{this.userField}} @class="btn-default" @icon="arrow-down" @disabled={{this.cantMoveDown}} />
       </div>
     </div>
-    <div class="row">{{flags}}</div>
+    <div class="row">{{this.flags}}</div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
index 31cfd51957f..94465764d3c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-watched-word.hbs
@@ -1,9 +1,9 @@
-<span role="button" onclick={{action "deleteWord"}} class="delete-word-record">{{d-icon "times"}}</span> {{word.word}}
-{{#if (or isReplace isLink)}}
-  &rarr; <span class="replacement">{{word.replacement}}</span>
-{{else if isTag}}
+<span role="button" onclick={{action "deleteWord"}} class="delete-word-record">{{d-icon "times"}}</span> {{this.word.word}}
+{{#if (or this.isReplace this.isLink)}}
+  &rarr; <span class="replacement">{{this.word.replacement}}</span>
+{{else if this.isTag}}
   &rarr;
-  {{#each tags as |tag|}}
+  {{#each this.tags as |tag|}}
     <span class="tag">{{tag}}</span>
   {{/each}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs
index ccad02b5f5d..0f219ca670a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event-chooser.hbs
@@ -1,3 +1,3 @@
-<Input @id={{typeName}} @type="checkbox" @name="event-choice" @checked={{enabled}} />
-<label for={{typeName}}>{{name}}</label>
-<p>{{details}}</p>
+<Input @id={{this.typeName}} @type="checkbox" @name="event-choice" @checked={{this.enabled}} />
+<label for={{this.typeName}}>{{this.name}}</label>
+<p>{{this.details}}</p>
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs
index 487d2efe32a..7e61c6b3279 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-event.hbs
@@ -1,19 +1,19 @@
 <div class="col first status">
-  <span class={{statusColorClasses}}>{{model.status}}</span>
+  <span class={{this.statusColorClasses}}>{{this.model.status}}</span>
 </div>
-<div class="col event-id">{{model.id}}</div>
-<div class="col timestamp">{{createdAt}}</div>
-<div class="col completion">{{completion}}</div>
+<div class="col event-id">{{this.model.id}}</div>
+<div class="col timestamp">{{this.createdAt}}</div>
+<div class="col completion">{{this.completion}}</div>
 <div class="col actions">
-  <DButton @icon={{expandRequestIcon}} @action={{action "toggleRequest"}} @label="admin.web_hooks.events.request" />
-  <DButton @icon={{expandResponseIcon}} @action={{action "toggleResponse"}} @label="admin.web_hooks.events.response" />
+  <DButton @icon={{this.expandRequestIcon}} @action={{action "toggleRequest"}} @label="admin.web_hooks.events.request" />
+  <DButton @icon={{this.expandResponseIcon}} @action={{action "toggleResponse"}} @label="admin.web_hooks.events.response" />
   <DButton @icon="sync" @action={{action "redeliver"}} @label="admin.web_hooks.events.redeliver" />
 </div>
-{{#if expandDetails}}
+{{#if this.expandDetails}}
   <div class="details">
     <h3>{{i18n "admin.web_hooks.events.headers"}}</h3>
-    <pre><code>{{headers}}</code></pre>
-    <h3>{{bodyLabel}}</h3>
-    <pre><code>{{body}}</code></pre>
+    <pre><code>{{this.headers}}</code></pre>
+    <h3>{{this.bodyLabel}}</h3>
+    <pre><code>{{this.body}}</code></pre>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs
index 7aa2d1455f4..0f7a1516b77 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-web-hook-status.hbs
@@ -1 +1 @@
-{{circleIcon}} {{deliveryStatus}}
+{{this.circleIcon}} {{this.deliveryStatus}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
index 2aff2986402..6ca305bbb9c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-feature-item.hbs
@@ -1,13 +1,13 @@
 <div class="admin-new-feature-item">
-  <div class="new-feature-emoji">{{item.emoji}}</div>
+  <div class="new-feature-emoji">{{this.item.emoji}}</div>
   <div class="new-feature-content">
     <div class="header">
-      {{#if item.link}}
-        <a href={{item.link}} target="_blank" rel="noopener noreferrer">{{item.title}}</a>
+      {{#if this.item.link}}
+        <a href={{this.item.link}} target="_blank" rel="noopener noreferrer">{{this.item.title}}</a>
       {{else}}
-        {{item.title}}
+        {{this.item.title}}
       {{/if}}
     </div>
-    <div class="feature-description">{{item.description}}</div>
+    <div class="feature-description">{{this.item.description}}</div>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
index f52f20bfa0a..ae7d5d12a17 100644
--- a/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/dashboard-new-features.hbs
@@ -1,19 +1,19 @@
-{{#if newFeatures}}
+{{#if this.newFeatures}}
   <div class="section-title">
     <h2>{{replace-emoji (i18n "admin.dashboard.new_features.title") }}</h2>
   </div>
 
-  <div class="section-body {{columnCountClass}}">
-    {{#each newFeatures as |feature|}}
+  <div class="section-body {{this.columnCountClass}}">
+    {{#each this.newFeatures as |feature|}}
       <DashboardNewFeatureItem @item={{feature}} @tagName="" />
     {{/each}}
   </div>
   <div class="section-footer">
-    {{#if releaseNotesLink}}
-      <a rel="noopener noreferrer" target="_blank" href={{releaseNotesLink}} class="btn btn-primary new-features-release-notes">
+    {{#if this.releaseNotesLink}}
+      <a rel="noopener noreferrer" target="_blank" href={{this.releaseNotesLink}} class="btn btn-primary new-features-release-notes">
         {{i18n "admin.dashboard.new_features.learn_more"}}
       </a>
     {{/if}}
-    <DButton @label="admin.dashboard.new_features.dismiss" @class="btn-default new-features-dismiss" @action={{dismissNewFeatures}} />
+    <DButton @label="admin.dashboard.new_features.dismiss" @class="btn-default new-features-dismiss" @action={{this.dismissNewFeatures}} />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs b/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs
index 82a32c24792..d7715c40bd5 100644
--- a/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/dashboard-problems.hbs
@@ -1,4 +1,4 @@
-{{#if foundProblems}}
+{{#if this.foundProblems}}
   <div class="section dashboard-problems">
     <div class="section-title">
       <h2>
@@ -8,11 +8,11 @@
     </div>
 
     <div class="section-body">
-      <ConditionalLoadingSection @isLoading={{loadingProblems}}>
-        {{#if highPriorityProblems.length}}
+      <ConditionalLoadingSection @isLoading={{this.loadingProblems}}>
+        {{#if this.highPriorityProblems.length}}
           <div class="problem-messages priority-high">
             <ul>
-              {{#each highPriorityProblems as |problem|}}
+              {{#each this.highPriorityProblems as |problem|}}
                 <li class={{concat "dashboard-problem " "priority-" problem.priority}}>
                   {{d-icon "exclamation-triangle"}} {{html-safe problem.message}}
                 </li>
@@ -23,15 +23,15 @@
 
         <div class="problem-messages priority-low">
           <ul>
-            {{#each lowPriorityProblems as |problem|}}
+            {{#each this.lowPriorityProblems as |problem|}}
               <li class={{concat "dashboard-problem " "priority-" problem.priority}}>{{html-safe problem.message}}</li>
             {{/each}}
           </ul>
         </div>
 
         <p class="actions">
-          <DButton @action={{refreshProblems}} @class="btn-default" @icon="sync" @label="admin.dashboard.refresh_problems" />
-          {{i18n "admin.dashboard.last_checked"}}: {{problemsTimestamp}}
+          <DButton @action={{this.refreshProblems}} @class="btn-default" @icon="sync" @label="admin.dashboard.refresh_problems" />
+          {{i18n "admin.dashboard.last_checked"}}: {{this.problemsTimestamp}}
         </p>
       </ConditionalLoadingSection>
     </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
index af2859bbe9a..d66d03651bf 100644
--- a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
@@ -9,10 +9,10 @@
   </div>
 </div>
 
-<AceEditor @content={{editorContents}} @mode={{currentEditorMode}} @editorId={{editorId}} @save={{action "save"}} />
+<AceEditor @content={{this.editorContents}} @mode={{this.currentEditorMode}} @editorId={{this.editorId}} @save={{action "save"}} />
 
 <div class="admin-footer">
   <div class="buttons">
-    <DButton @action={{action "reset"}} @disabled={{resetDisabled}} @class="btn-default" @label="admin.customize.email_style.reset" />
+    <DButton @action={{action "reset"}} @disabled={{this.resetDisabled}} @class="btn-default" @label="admin.customize.email_style.reset" />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
index 83c445e3837..cf6b8ad88a2 100644
--- a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
@@ -1,29 +1,29 @@
-{{#if editing}}
+{{#if this.editing}}
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.host"}}</div>
-    <Input @value={{buffered.host}} placeholder="example.com" @enter={{action "save"}} class="host-name" @autofocus={{true}} />
+    <Input @value={{this.buffered.host}} placeholder="example.com" @enter={{action "save"}} class="host-name" @autofocus={{true}} />
   </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.class_name"}}</div>
-    <Input @value={{buffered.class_name}} placeholder="class" @enter={{action "save"}} class="class-name" />
+    <Input @value={{this.buffered.class_name}} placeholder="class" @enter={{action "save"}} class="class-name" />
   </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.allowed_paths"}}</div>
-    <Input @value={{buffered.allowed_paths}} placeholder="/blog/.*" @enter={{action "save"}} class="path-allowlist" />
+    <Input @value={{this.buffered.allowed_paths}} placeholder="/blog/.*" @enter={{action "save"}} class="path-allowlist" />
   </td>
   <td class="editing-input">
     <div class="label">{{i18n "admin.embedding.category"}}</div>
-    <CategoryChooser @value={{categoryId}} @class="small" @onChange={{action (mut categoryId)}} />
+    <CategoryChooser @value={{this.categoryId}} @class="small" @onChange={{action (mut this.categoryId)}} />
   </td>
   <td class="editing-controls">
-    <DButton @icon="check" @action={{action "save"}} @class="btn-primary" @disabled={{cantSave}} />
-    <DButton @icon="times" @action={{action "cancel"}} @class="btn-danger" @disabled={{host.isSaving}} />
+    <DButton @icon="check" @action={{action "save"}} @class="btn-primary" @disabled={{this.cantSave}} />
+    <DButton @icon="times" @action={{action "cancel"}} @class="btn-danger" @disabled={{this.host.isSaving}} />
   </td>
 {{else}}
-  <td><div class="label">{{i18n "admin.embedding.host"}}</div>{{host.host}}</td>
-  <td><div class="label">{{i18n "admin.embedding.class_name"}}</div>{{host.class_name}}</td>
-  <td><div class="label">{{i18n "admin.embedding.allowed_paths"}}</div>{{host.allowed_paths}}</td>
-  <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge host.category allowUncategorized=true}}</td>
+  <td><div class="label">{{i18n "admin.embedding.host"}}</div>{{this.host.host}}</td>
+  <td><div class="label">{{i18n "admin.embedding.class_name"}}</div>{{this.host.class_name}}</td>
+  <td><div class="label">{{i18n "admin.embedding.allowed_paths"}}</div>{{this.host.allowed_paths}}</td>
+  <td><div class="label">{{i18n "admin.embedding.category"}}</div>{{category-badge this.host.category allowUncategorized=true}}</td>
   <td class="controls">
     <DButton @icon="pencil-alt" @action={{action "edit"}} />
     <DButton @icon="far-trash-alt" @action={{action "delete"}} @class="btn-danger" />
diff --git a/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs b/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs
index 818cc0c60aa..795e4a7c417 100644
--- a/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/embedding-setting.hbs
@@ -1,11 +1,11 @@
-{{#if isCheckbox}}
-  <label for={{inputId}}>
-    <Input @checked={{checked}} @id={{inputId}} @type="checkbox" />
-    {{i18n translationKey}}
+{{#if this.isCheckbox}}
+  <label for={{this.inputId}}>
+    <Input @checked={{this.checked}} @id={{this.inputId}} @type="checkbox" />
+    {{i18n this.translationKey}}
   </label>
 {{else}}
-  <label for={{inputId}}>{{i18n translationKey}}</label>
-  <Input @value={{value}} @id={{inputId}} placeholder={{placeholder}} />
+  <label for={{this.inputId}}>{{i18n this.translationKey}}</label>
+  <Input @value={{this.value}} @id={{this.inputId}} placeholder={{this.placeholder}} />
 {{/if}}
 
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
index e21c562651e..df8ae5ed321 100644
--- a/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/emoji-value-list.hbs
@@ -1,6 +1,6 @@
-{{#if collection}}
+{{#if this.collection}}
   <ul class="values emoji-value-list">
-    {{#each collection as |data index|}}
+    {{#each this.collection as |data index|}}
       <li class="value" data-index={{index}}>
         <DButton @action={{action "removeValue"}} @actionParam={{data}} @icon="times" @class="remove-value-btn btn-small" @disabled={{not data.isEditable}} />
 
@@ -9,7 +9,7 @@
           <span class="emoji-name">{{data.value}}</span>
         </div>
 
-        {{#if showUpDownButtons}}
+        {{#if this.showUpDownButtons}}
           <DButton @action={{action "shift" -1 index}} @icon="arrow-up" @class="shift-up-value-btn btn-small" />
           <DButton @action={{action "shift" 1 index}} @icon="arrow-down" @class="shift-down-value-btn btn-small" />
         {{/if}}
@@ -19,9 +19,9 @@
 {{/if}}
 
 <div class="value">
-  <DButton @action={{action "editValue"}} @actionParam={{data}} @icon="discourse-emojis" @class="add-emoji-button d-editor-textarea-wrapper" @label="admin.site_settings.emoji_list.add_emoji_button.label" />
+  <DButton @action={{action "editValue"}} @actionParam={{this.data}} @icon="discourse-emojis" @class="add-emoji-button d-editor-textarea-wrapper" @label="admin.site_settings.emoji_list.add_emoji_button.label" />
 </div>
 
-<EmojiPicker @isActive={{emojiPickerIsActive}} @isEditorFocused={{isEditorFocused}} @emojiSelected={{action "emojiSelected"}} @onEmojiPickerClose={{action "closeEmojiPicker"}} />
+<EmojiPicker @isActive={{this.emojiPickerIsActive}} @isEditorFocused={{this.isEditorFocused}} @emojiSelected={{action "emojiSelected"}} @onEmojiPickerClose={{action "closeEmojiPicker"}} />
 
-<SettingValidationMessage @message={{validationMessage}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs b/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs
index ea058c8c4eb..dcecd918bc0 100644
--- a/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/flag-user-lists.hbs
@@ -3,7 +3,7 @@
     {{i18n "admin.flags.flagged_by"}}
   </div>
   <div class="flag-users">
-    {{#each flaggedPost.post_actions as |postAction|}}
+    {{#each this.flaggedPost.post_actions as |postAction|}}
       <FlagUser @user={{postAction.user}} @date={{postAction.created_at}}>
         <div class="flagger-flag-type">
           {{post-action-title postAction.post_action_type_id postAction.name_key}}
@@ -14,13 +14,13 @@
   </div>
 </div>
 
-{{#if showResolvedBy}}
+{{#if this.showResolvedBy}}
   <div class="flagged-post-resolved-by">
     <div class="user-list-title">
       {{i18n "admin.flags.resolved_by"}}
     </div>
     <div class="flag-users">
-      {{#each flaggedPost.post_actions as |postAction|}}
+      {{#each this.flaggedPost.post_actions as |postAction|}}
         <FlagUser @user={{postAction.disposed_by}} @date={{postAction.disposed_at}}>
           {{disposition-icon postAction.disposition}}
           {{#if postAction.staff_took_action}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs b/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs
index 43f19485a81..d7b8044be0a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/flag-user.hbs
@@ -1,14 +1,14 @@
 <div class="flag-user">
-  <LinkTo @route="adminUser" @models={{array user.id user.username}} class="flag-user-avatar">
-    {{avatar user imageSize="small"}}
+  <LinkTo @route="adminUser" @models={{array this.user.id this.user.username}} class="flag-user-avatar">
+    {{avatar this.user imageSize="small"}}
   </LinkTo>
   <div class="flag-user-details">
     <div class="flag-user-who">
-      <LinkTo @route="adminUser" @models={{array user.id user.username}} class="flag-user-username">
-        {{user.username}}
+      <LinkTo @route="adminUser" @models={{array this.user.id this.user.username}} class="flag-user-username">
+        {{this.user.username}}
       </LinkTo>
-      <div title={{raw-date date}} class="flag-user-date">
-        {{format-age date}}
+      <div title={{raw-date this.date}} class="flag-user-date">
+        {{format-age this.date}}
       </div>
     </div>
     <div class="flag-user-extra">
diff --git a/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs b/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs
index 4d67dd6fd2e..1707a5f6de4 100644
--- a/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/highlighted-code.hbs
@@ -1 +1 @@
-<pre><code class={{lang}}>{{code}}</code></pre>
+<pre><code class={{this.lang}}>{{this.code}}</code></pre>
diff --git a/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs b/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs
index 9db2fcc1d5f..4ca3d9c2c00 100644
--- a/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/inline-edit-checkbox.hbs
@@ -1,8 +1,8 @@
 <label class="checkbox-label">
-  <Input @type="checkbox" @disabled={{disabled}} @checked={{buffer}} />
-  {{i18n labelKey}}
+  <Input @type="checkbox" @disabled={{this.disabled}} @checked={{this.buffer}} />
+  {{i18n this.labelKey}}
 </label>
-{{#if changed}}
+{{#if this.changed}}
   <DButton @action={{action "apply"}} @class="btn-primary btn-small submit-edit" @icon="check" />
   <DButton @action={{action "cancel"}} @class="btn-small cancel-edit" @icon="times" />
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs b/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs
index 81169521131..1dd120c3b1c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/install-theme-item.hbs
@@ -1,8 +1,8 @@
-<RadioButton @name="install-items" @id={{value}} @value={{value}} @selection={{selection}} />
-<label class="radio" for={{value}}>
-  {{#if showIcon}}
+<RadioButton @name="install-items" @id={{this.value}} @value={{this.value}} @selection={{this.selection}} />
+<label class="radio" for={{this.value}}>
+  {{#if this.showIcon}}
     {{d-icon "plus"}}
   {{/if}}
-  {{i18n label}}
+  {{i18n this.label}}
 </label>
 {{d-icon "caret-right"}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
index e91799fb02a..f63ab16730a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/ip-lookup.hbs
@@ -1,10 +1,10 @@
-{{#if ip}}
+{{#if this.ip}}
   <DButton @class="btn-default" @action={{action "lookup"}} @icon="globe" @label="admin.user.ip_lookup" />
 {{/if}}
-{{#if show}}
+{{#if this.show}}
   <div class="location-box">
     <a href class="close pull-right" {{action "hide"}}>{{d-icon "times"}}</a>
-    {{#if copied}}
+    {{#if this.copied}}
       <DButton @class="btn-hover pull-right" @icon="copy" @label="ip_lookup.copied" />
     {{else}}
       <DButton @action={{action "copy"}} @class="pull-right no-text" @icon="copy" />
@@ -12,26 +12,26 @@
     <h4>{{i18n "ip_lookup.title"}}</h4>
     <p class="powered-by">{{html-safe (i18n "ip_lookup.powered_by")}}</p>
     <dl>
-      {{#if location}}
-        {{#if location.hostname}}
+      {{#if this.location}}
+        {{#if this.location.hostname}}
           <dt>{{i18n "ip_lookup.hostname"}}</dt>
-          <dd>{{location.hostname}}</dd>
+          <dd>{{this.location.hostname}}</dd>
         {{/if}}
 
         <dt>{{i18n "ip_lookup.location"}}</dt>
         <dd>
-          {{#if location.location}}
-            <a href="https://maps.google.com/maps?q={{location.latitude}},{{location.longitude}}" rel="noopener noreferrer" target="_blank">
-              {{location.location}}
+          {{#if this.location.location}}
+            <a href="https://maps.google.com/maps?q={{this.location.latitude}},{{this.location.longitude}}" rel="noopener noreferrer" target="_blank">
+              {{this.location.location}}
             </a>
           {{else}}
             {{i18n "ip_lookup.location_not_found"}}
           {{/if}}
         </dd>
 
-        {{#if location.organization}}
+        {{#if this.location.organization}}
           <dt>{{i18n "ip_lookup.organisation"}}</dt>
-          <dd>{{location.organization}}</dd>
+          <dd>{{this.location.organization}}</dd>
         {{/if}}
       {{else}}
         {{loading-spinner size="small"}}
@@ -39,14 +39,14 @@
 
       <dt>
         {{i18n "ip_lookup.other_accounts"}}
-        <strong>{{totalOthersWithSameIP}}</strong>
-        {{#if other_accounts.length}}
-          <DButton @class="btn-danger pull-right" @action={{action "deleteOtherAccounts"}} @icon="exclamation-triangle" @translatedLabel={{i18n "ip_lookup.delete_other_accounts" count=otherAccountsToDelete}} />
+        <strong>{{this.totalOthersWithSameIP}}</strong>
+        {{#if this.other_accounts.length}}
+          <DButton @class="btn-danger pull-right" @action={{action "deleteOtherAccounts"}} @icon="exclamation-triangle" @translatedLabel={{i18n "ip_lookup.delete_other_accounts" count=this.otherAccountsToDelete}} />
         {{/if}}
       </dt>
 
-      <ConditionalLoadingSpinner @size="small" @condition={{otherAccountsLoading}}>
-        {{#if other_accounts.length}}
+      <ConditionalLoadingSpinner @size="small" @condition={{this.otherAccountsLoading}}>
+        {{#if this.other_accounts.length}}
           <dd class="other-accounts">
             <table class="table table-condensed table-hover">
               <thead>
@@ -59,7 +59,7 @@
                 </tr>
               </thead>
               <tbody>
-                {{#each other_accounts as |a|}}
+                {{#each this.other_accounts as |a|}}
                   <tr>
                     <td>
                       <LinkTo @route="adminUser" @model={{a}}>
diff --git a/app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs b/app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs
index 991f107d8db..8e9c5a508e5 100644
--- a/app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/penalty-post-action.hbs
@@ -4,11 +4,11 @@
       {{html-safe (i18n "admin.user.penalty_post_actions")}}
     </div>
   </label>
-  <ComboBox @value={{postAction}} @content={{penaltyActions}} @onChange={{action "penaltyChanged"}} />
+  <ComboBox @value={{this.postAction}} @content={{this.penaltyActions}} @onChange={{action "penaltyChanged"}} />
 </div>
 
-{{#if editing}}
+{{#if this.editing}}
   <div class="penalty-post-edit">
-    <Textarea @value={{postEdit}} class="post-editor" />
+    <Textarea @value={{this.postEdit}} class="post-editor" />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs b/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs
index 4ff56bf1dbf..705ac6894d0 100644
--- a/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/permalink-form.hbs
@@ -2,12 +2,12 @@
   <div class="inline-form">
     <label>{{i18n "admin.permalink.form.label"}}</label>
 
-    <TextField @value={{url}} @disabled={{formSubmitted}} @class="permalink-url" @placeholderKey="admin.permalink.url" @autocorrect="off" @autocapitalize="off" />
+    <TextField @value={{this.url}} @disabled={{this.formSubmitted}} @class="permalink-url" @placeholderKey="admin.permalink.url" @autocorrect="off" @autocapitalize="off" />
 
-    <ComboBox @content={{permalinkTypes}} @value={{permalinkType}} @onChange={{action (mut permalinkType)}} @class="permalink-type" />
+    <ComboBox @content={{this.permalinkTypes}} @value={{this.permalinkType}} @onChange={{action (mut this.permalinkType)}} @class="permalink-type" />
 
-    <TextField @value={{permalinkTypeValue}} @disabled={{formSubmitted}} @placeholderKey={{permalinkTypePlaceholder}} @autocorrect="off" @autocapitalize="off" @keyDown={{action "submitFormOnEnter"}} />
+    <TextField @value={{this.permalinkTypeValue}} @disabled={{this.formSubmitted}} @placeholderKey={{this.permalinkTypePlaceholder}} @autocorrect="off" @autocapitalize="off" @keyDown={{action "submitFormOnEnter"}} />
 
-    <DButton @action={{action "onSubmit"}} @disabled={{formSubmitted}} @label="admin.permalink.form.add" />
+    <DButton @action={{action "onSubmit"}} @disabled={{this.formSubmitted}} @label="admin.permalink.form.add" />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
index ee9caaaef69..3f0c38bc036 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/bool.hbs
@@ -1 +1 @@
-<Input @type="checkbox" @checked={{checked}} @click={{action "onChange"}} />
+<Input @type="checkbox" @checked={{this.checked}} @click={{action "onChange"}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs
index d6e63f575a2..7c48353230e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/category.hbs
@@ -1 +1 @@
-<SearchAdvancedCategoryChooser @value={{category}} @onChange={{action "onChange"}} @options={{hash filterable=true}} />
+<SearchAdvancedCategoryChooser @value={{this.category}} @onChange={{action "onChange"}} @options={{hash filterable=true}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs
index eb11cf42524..72617d71c81 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/group.hbs
@@ -1,5 +1,5 @@
-<ComboBox @valueProperty="value" @content={{groupOptions}} @value={{groupId}} @onChange={{action "onChange"}} @options={{hash
-    allowAny=filter.allow_any
+<ComboBox @valueProperty="value" @content={{this.groupOptions}} @value={{this.groupId}} @onChange={{action "onChange"}} @options={{hash
+    allowAny=this.filter.allow_any
     filterable=true
     none="admin.dashboard.reports.groups"
   }} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs b/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs
index 584b028cf73..17ab33991b7 100644
--- a/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/report-filters/list.hbs
@@ -1,5 +1,5 @@
-<ComboBox @content={{filter.choices}} @value={{filter.default}} @onChange={{action "onChange"}} @options={{hash
-    allowAny=filter.allow_any
+<ComboBox @content={{this.filter.choices}} @value={{this.filter.default}} @onChange={{action "onChange"}} @options={{hash
+    allowAny=this.filter.allow_any
     filterable=true
     none="admin.dashboard.report_filter_any"
   }} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs b/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs
index 9186abcbe50..3ccc682a2fd 100644
--- a/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/resumable-upload.hbs
@@ -1,3 +1,3 @@
-{{uploadingIcon}}
-<span class="ru-label">{{text}}</span>
-<span style={{progressBar}} class="ru-progress"></span>
+{{this.uploadingIcon}}
+<span class="ru-label">{{this.text}}</span>
+<span style={{this.progressBar}} class="ru-progress"></span>
diff --git a/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs
index ce7bb6e485c..3bd9582d56f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/screened-ip-address-form.hbs
@@ -1,6 +1,6 @@
 <label>{{i18n "admin.logs.screened_ips.form.label"}}</label>
-<TextField @value={{ip_address}} @disabled={{formSubmitted}} @class="ip-address-input" @placeholderKey="admin.logs.screened_ips.form.ip_address" @autocorrect="off" @autocapitalize="off" />
+<TextField @value={{this.ip_address}} @disabled={{this.formSubmitted}} @class="ip-address-input" @placeholderKey="admin.logs.screened_ips.form.ip_address" @autocorrect="off" @autocapitalize="off" />
 
-<ComboBox @content={{actionNames}} @value={{actionName}} @onChange={{action (mut actionName)}} />
+<ComboBox @content={{this.actionNames}} @value={{this.actionName}} @onChange={{action (mut this.actionName)}} />
 
-<DButton @class="btn-default" @action={{action "submit"}} @disabled={{formSubmitted}} @label="admin.logs.screened_ips.form.add" />
+<DButton @class="btn-default" @action={{action "submit"}} @disabled={{this.formSubmitted}} @label="admin.logs.screened_ips.form.add" />
diff --git a/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs
index 2429f9ad8a8..ef447101e13 100644
--- a/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/secret-value-list.hbs
@@ -1,19 +1,19 @@
-{{#if collection}}
+{{#if this.collection}}
   <div class="values">
-    {{#each collection as |value index|}}
+    {{#each this.collection as |value index|}}
       <div class="value" data-index={{index}}>
         <DButton @action={{action "removeValue"}} @actionParam={{value}} @icon="times" @class="remove-value-btn btn-small" />
         <Input @value={{value.key}} class="value-input" @focus-out={{action "changeKey" index}} />
-        <Input @value={{value.secret}} class="value-input" @focus-out={{action "changeSecret" index}} @type={{if isSecret "password" "text"}} />
+        <Input @value={{value.secret}} class="value-input" @focus-out={{action "changeSecret" index}} @type={{if this.isSecret "password" "text"}} />
       </div>
     {{/each}}
   </div>
 {{/if}}
 
 <div class="value">
-  <TextField @value={{newKey}} @class="new-value-input key" @placeholder={{setting.placeholder.key}} />
-  <Input @type="password" @value={{newSecret}} class="new-value-input secret" placeholder={{setting.placeholder.value}} />
+  <TextField @value={{this.newKey}} @class="new-value-input key" @placeholder={{this.setting.placeholder.key}} />
+  <Input @type="password" @value={{this.newSecret}} class="new-value-input secret" placeholder={{this.setting.placeholder.value}} />
   <DButton @action={{action "addValue"}} @icon="plus" @class="add-value-btn btn-small" />
 </div>
 
-<SettingValidationMessage @message={{validationMessage}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs b/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs
index 61683c73b0e..7cf378103ca 100644
--- a/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/setting-validation-message.hbs
@@ -1,4 +1,4 @@
-<div class="validation-error {{unless message "hidden"}}">
+<div class="validation-error {{unless this.message "hidden"}}">
   {{d-icon "times"}}
-  {{message}}
+  {{this.message}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs b/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs
index 84727644ba8..b68c80d4def 100644
--- a/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/silence-details.hbs
@@ -4,7 +4,7 @@
       {{html-safe (i18n "admin.user.silence_reason_label")}}
     </div>
   </label>
-  <TextField @value={{reason}} @class="silence-reason" @placeholderKey="admin.user.silence_reason_placeholder" />
+  <TextField @value={{this.reason}} @class="silence-reason" @placeholderKey="admin.user.silence_reason_placeholder" />
 </div>
 
 <label>
@@ -12,4 +12,4 @@
     {{i18n "admin.user.silence_message"}}
   </div>
 </label>
-<Textarea @value={{message}} class="silence-message" placeholder={{i18n "admin.user.silence_message_placeholder"}} />
+<Textarea @value={{this.message}} class="silence-message" placeholder={{i18n "admin.user.silence_message_placeholder"}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs b/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
index 0161851fce0..b13b021a7e5 100644
--- a/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/simple-list.hbs
@@ -1,12 +1,12 @@
-{{#if collection}}
+{{#if this.collection}}
   <div class="values">
-    {{#each collection as |value index|}}
+    {{#each this.collection as |value index|}}
       <div data-index={{index}} class="value">
         <DButton @action={{action "removeValue"}} @actionParam={{value}} @icon="times" @class="remove-value-btn btn-small" />
 
         <Input @title={{value}} @value={{value}} class="value-input" @focus-out={{action "changeValue" index}} />
 
-        {{#if showUpDownButtons}}
+        {{#if this.showUpDownButtons}}
           <DButton @action={{action "shift" -1 index}} @icon="arrow-up" @class="shift-up-value-btn btn-small" />
           <DButton @action={{action "shift" 1 index}} @icon="arrow-down" @class="shift-down-value-btn btn-small" />
         {{/if}}
@@ -18,7 +18,7 @@
 {{/if}}
 
 <div class="simple-list-input">
-  <Input @type="text" @value={{newValue}} @placeholderKey="admin.site_settings.simple_list.add_item" class="add-value-input" @autocomplete="off" @autocorrect="off" @autocapitalize="off" />
+  <Input @type="text" @value={{this.newValue}} @placeholderKey="admin.site_settings.simple_list.add_item" class="add-value-input" @autocomplete="off" @autocorrect="off" @autocapitalize="off" />
 
-  <DButton @action={{action "addValue"}} @actionParam={{newValue}} @disabled={{inputEmpty}} @icon="plus" @class="add-value-btn btn-small" />
+  <DButton @action={{action "addValue"}} @actionParam={{this.newValue}} @disabled={{this.inputEmpty}} @icon="plus" @class="add-value-btn btn-small" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs
index 501b0105927..512ddceff90 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-details.hbs
@@ -1,18 +1,18 @@
 <section class="field">
-  <b>{{i18n "admin.customize.enabled"}}</b>: {{change.enabled}}
+  <b>{{i18n "admin.customize.enabled"}}</b>: {{this.change.enabled}}
 </section>
 
-<SiteCustomizationChangeField @field={{change.stylesheet}} @name="admin.customize.css" />
-<SiteCustomizationChangeField @icon="mobile" @field={{change.mobile_stylesheet}} @name="admin.customize.css" />
+<SiteCustomizationChangeField @field={{this.change.stylesheet}} @name="admin.customize.css" />
+<SiteCustomizationChangeField @icon="mobile" @field={{this.change.mobile_stylesheet}} @name="admin.customize.css" />
 
-<SiteCustomizationChangeField @field={{change.header}} @name="admin.customize.header" />
-<SiteCustomizationChangeField @icon="mobile" @field={{change.mobile_header}} @name="admin.customize.header" />
+<SiteCustomizationChangeField @field={{this.change.header}} @name="admin.customize.header" />
+<SiteCustomizationChangeField @icon="mobile" @field={{this.change.mobile_header}} @name="admin.customize.header" />
 
-<SiteCustomizationChangeField @field={{change.top}} @name="admin.customize.top" />
-<SiteCustomizationChangeField @icon="mobile" @field={{change.mobile_top}} @name="admin.customize.top" />
+<SiteCustomizationChangeField @field={{this.change.top}} @name="admin.customize.top" />
+<SiteCustomizationChangeField @icon="mobile" @field={{this.change.mobile_top}} @name="admin.customize.top" />
 
-<SiteCustomizationChangeField @field={{change.footer}} @name="admin.customize.footer" />
-<SiteCustomizationChangeField @icon="mobile" @field={{change.mobile_footer}} @name="admin.customize.footer" />
+<SiteCustomizationChangeField @field={{this.change.footer}} @name="admin.customize.footer" />
+<SiteCustomizationChangeField @icon="mobile" @field={{this.change.mobile_footer}} @name="admin.customize.footer" />
 
-<SiteCustomizationChangeField @icon="file-text-o" @field={{change.head_tag}} @name="admin.customize.head_tag.text" />
-<SiteCustomizationChangeField @icon="file-text-o" @field={{change.body_tag}} @name="admin.customize.body_tag.text" />
+<SiteCustomizationChangeField @icon="file-text-o" @field={{this.change.head_tag}} @name="admin.customize.head_tag.text" />
+<SiteCustomizationChangeField @icon="file-text-o" @field={{this.change.body_tag}} @name="admin.customize.body_tag.text" />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs
index 3c4d3fa099c..71bb054ec89 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-customization-change-field.hbs
@@ -1,7 +1,7 @@
-{{#if field}}
+{{#if this.field}}
   <section class="field">
-    <b>{{i18n name}}</b>: ({{i18n "character_count" count=field.length}})
+    <b>{{i18n this.name}}</b>: ({{i18n "character_count" count=this.field.length}})
     <br>
-    <Textarea @value={{field}} class="plain" />
+    <Textarea @value={{this.field}} class="plain" />
   </section>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs b/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
index fd6910d0e53..8a305532564 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
@@ -1,30 +1,30 @@
 <div class="setting-label">
   <h3>
-    {{#if staffLogFilter}}
-      {{settingName}}
-      <LinkTo @route="adminLogs.staffActionLogs" @query={{hash filters=staffLogFilter force_refresh=true}} @title={{i18n "admin.settings.history"}}>
+    {{#if this.staffLogFilter}}
+      {{this.settingName}}
+      <LinkTo @route="adminLogs.staffActionLogs" @query={{hash filters=this.staffLogFilter force_refresh=true}} @title={{i18n "admin.settings.history"}}>
         <span class="history-icon">
           {{d-icon "history"}}
         </span>
       </LinkTo>
     {{else}}
-      {{settingName}}
+      {{this.settingName}}
     {{/if}}
   </h3>
-  {{#if defaultIsAvailable}}
-    <a href onClick={{action "setDefaultValues"}}>{{setting.setDefaultValuesLabel}}</a>
+  {{#if this.defaultIsAvailable}}
+    <a href onClick={{action "setDefaultValues"}}>{{this.setting.setDefaultValuesLabel}}</a>
   {{/if}}
 </div>
 <div class="setting-value">
-  {{component componentName setting=setting value=buffered.value validationMessage=validationMessage preview=preview isSecret=isSecret allowAny=allowAny}}
+  {{component this.componentName setting=this.setting value=this.buffered.value validationMessage=this.validationMessage preview=this.preview isSecret=this.isSecret allowAny=this.allowAny}}
 </div>
-{{#if dirty}}
+{{#if this.dirty}}
   <div class="setting-controls">
     <DButton @class="ok" @action={{action "update"}} @icon="check" />
     <DButton @class="cancel" @action={{action "cancel"}} @icon="times" />
   </div>
-{{else if setting.overridden}}
-  {{#if setting.secret}}
+{{else if this.setting.overridden}}
+  {{#if this.setting.secret}}
     <DButton @action={{action "toggleSecret"}} @icon="far-eye-slash" />
   {{/if}}
   <DButton @class="btn-default undo" @action={{action "resetDefault"}} @icon="undo" @label="admin.settings.reset" />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs
index 29ec01159fa..193caf374eb 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/bool.hbs
@@ -1,6 +1,6 @@
 <label>
-  <Input @type="checkbox" @checked={{enabled}} />
-  <span>{{html-safe setting.description}}</span>
+  <Input @type="checkbox" @checked={{this.enabled}} />
+  <span>{{html-safe this.setting.description}}</span>
 </label>
 
-<SettingValidationMessage @message={{validationMessage}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs
index 5019261a245..8e0c87191b0 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/category-list.hbs
@@ -1,4 +1,4 @@
-<CategorySelector @categories={{selectedCategories}} @onChange={{action "onChangeSelectedCategories"}} />
+<CategorySelector @categories={{this.selectedCategories}} @onChange={{action "onChangeSelectedCategories"}} />
 
-<div class="desc">{{html-safe setting.description}}</div>
-<SettingValidationMessage @message={{validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs
index 2986fef49e3..b34c1af659d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/category.hbs
@@ -1,6 +1,6 @@
-<CategoryChooser @value={{value}} @onChange={{action (mut value)}} @options={{hash
+<CategoryChooser @value={{this.value}} @onChange={{action (mut this.value)}} @options={{hash
     allowUncategorized=true
-    none=(eq setting.default "")
+    none=(eq this.setting.default "")
   }} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs
index 05d28ae1ada..f55ef22fe35 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/color.hbs
@@ -1,3 +1,3 @@
-<ColorInput @hexValue={{readonly value}} @valid={{valid}} @onlyHex={{false}} @styleSelection={{false}} @onChangeColor={{action "onChangeColor"}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<ColorInput @hexValue={{readonly this.value}} @valid={{this.valid}} @onlyHex={{false}} @styleSelection={{false}} @onChangeColor={{action "onChangeColor"}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs
index 6d1f56e6bd9..013aaaf193e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/compact-list.hbs
@@ -1,6 +1,6 @@
-<ListSetting @value={{settingValue}} @settingName={{setting.setting}} @choices={{settingChoices}} @onChange={{action "onChangeListSetting"}} @onChangeChoices={{action "onChangeChoices"}} @options={{hash
-    allowAny=allowAny
+<ListSetting @value={{this.settingValue}} @settingName={{this.setting.setting}} @choices={{this.settingChoices}} @onChange={{action "onChangeListSetting"}} @onChangeChoices={{action "onChangeChoices"}} @options={{hash
+    allowAny=this.allowAny
   }} />
 
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
index 1a42748ff11..04289d1f88a 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/emoji-list.hbs
@@ -1,3 +1,3 @@
-<EmojiValueList @setting={{setting}} @values={{value}} />
-<div class="desc">{{html-safe setting.description}}</div>
-<SettingValidationMessage @message={{validationMessage}} />
+<EmojiValueList @setting={{this.setting}} @values={{this.value}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs
index e11ec645827..3dce2283915 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/enum.hbs
@@ -1,12 +1,12 @@
-<ComboBox @content={{setting.validValues}} @value={{value}} @onChange={{action (mut value)}} @valueProperty={{setting.computedValueProperty}} @nameProperty={{setting.computedNameProperty}} @options={{hash
+<ComboBox @content={{this.setting.validValues}} @value={{this.value}} @onChange={{action (mut this.value)}} @valueProperty={{this.setting.computedValueProperty}} @nameProperty={{this.setting.computedNameProperty}} @options={{hash
     castInteger=true
-    allowAny=setting.allowsNone
+    allowAny=this.setting.allowsNone
   }} />
 
-{{preview}}
+{{this.preview}}
 
-<SettingValidationMessage @message={{validationMessage}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
 
 <div class="desc">
-  {{html-safe setting.description}}
+  {{html-safe this.setting.description}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs
index 96a009b3490..6bfc5c7f664 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/group-list.hbs
@@ -1,3 +1,3 @@
-<ListSetting @value={{settingValue}} @choices={{groupChoices}} @settingName="name" @nameProperty={{nameProperty}} @valueProperty={{valueProperty}} @onChange={{action "onChangeGroupListSetting"}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<ListSetting @value={{this.settingValue}} @choices={{this.groupChoices}} @settingName="name" @nameProperty={{this.nameProperty}} @valueProperty={{this.valueProperty}} @onChange={{action "onChangeGroupListSetting"}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs
index 8953f1350ad..caa8bf2a05e 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/host-list.hbs
@@ -1,6 +1,6 @@
-<ListSetting @value={{settingValue}} @settingName={{setting.setting}} @choices={{settingValue}} @onChange={{action "onChange"}} @options={{hash
-    allowAny=allowAny
+<ListSetting @value={{this.settingValue}} @settingName={{this.setting.setting}} @choices={{this.settingValue}} @onChange={{action "onChange"}} @options={{hash
+    allowAny=this.allowAny
   }} />
 
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs
index d0cbacd5ea7..a173773c339 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/list.hbs
@@ -1,3 +1,3 @@
-<ValueList @values={{value}} @inputDelimiter="|" @choices={{setting.choices}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<ValueList @values={{this.value}} @inputDelimiter="|" @choices={{this.setting.choices}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs
index 9f3393704ab..e756018c3dc 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/named-list.hbs
@@ -1,6 +1,6 @@
-<ListSetting @value={{settingValue}} @settingName={{setting.setting}} @choices={{settingChoices}} @nameProperty="name" @valueProperty="value" @onChange={{action "onChangeListSetting"}} @options={{hash
-    allowAny=allowAny
+<ListSetting @value={{this.settingValue}} @settingName={{this.setting.setting}} @choices={{this.settingChoices}} @nameProperty="name" @valueProperty="value" @onChange={{action "onChangeListSetting"}} @options={{hash
+    allowAny=this.allowAny
   }} />
 
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs
index 26010dd8048..5cc662ffa25 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/secret-list.hbs
@@ -1,3 +1,3 @@
-<SecretValueList @setting={{setting}} @values={{value}} @isSecret={{isSecret}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SecretValueList @setting={{this.setting}} @values={{this.value}} @isSecret={{this.isSecret}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs
index 0d34eee4b8b..3b1944e5d5d 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/simple-list.hbs
@@ -1,3 +1,3 @@
-<SimpleList @values={{value}} @inputDelimiter={{inputDelimiter}} @onChange={{action "onChange"}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SimpleList @values={{this.value}} @inputDelimiter={{this.inputDelimiter}} @onChange={{action "onChange"}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
index 28d4a0a44ad..7d0b7cb72e9 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/string.hbs
@@ -1,12 +1,12 @@
-{{#if setting.textarea}}
-  <Textarea @value={{value}} @classNames="input-setting-textarea" />
-{{else if setting.json_schema}}
+{{#if this.setting.textarea}}
+  <Textarea @value={{this.value}} @classNames="input-setting-textarea" />
+{{else if this.setting.json_schema}}
   <DButton @action={{action "launchJsonEditorModal"}} @icon="pencil-alt" @label="admin.site_settings.json_schema.edit" />
-{{else if isSecret}}
-  <Input @type="password" @value={{value}} @classNames="input-setting-string" />
+{{else if this.isSecret}}
+  <Input @type="password" @value={{this.value}} @classNames="input-setting-string" />
 {{else}}
-  <TextField @value={{value}} @classNames="input-setting-string" />
+  <TextField @value={{this.value}} @classNames="input-setting-string" />
 {{/if}}
 
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
index 2f0375bb6b5..229aa03234b 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/tag-list.hbs
@@ -1,6 +1,6 @@
-<TagChooser @tags={{selectedTags}} @onChange={{action "changeSelectedTags"}} @everyTag={{true}} @options={{hash
+<TagChooser @tags={{this.selectedTags}} @onChange={{action "changeSelectedTags"}} @everyTag={{true}} @options={{hash
     allowAny=false
     maximum=null
   }} />
-<div class="desc">{{html-safe setting.description}}</div>
-<SettingValidationMessage @message={{validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs
index d68639ddd66..fdf0187baf2 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/upload.hbs
@@ -1,3 +1,3 @@
-<UppyImageUploader @imageUrl={{value}} @placeholderUrl={{setting.placeholder}} @additionalParams={{hash for_site_setting=true}} @type="site_setting" @id={{concat "site-setting-image-uploader-" setting.setting}} />
-<div class="desc">{{html-safe setting.description}}</div>
-<SettingValidationMessage @message={{validationMessage}} />
+<UppyImageUploader @imageUrl={{this.value}} @placeholderUrl={{this.setting.placeholder}} @additionalParams={{hash for_site_setting=true}} @type="site_setting" @id={{concat "site-setting-image-uploader-" this.setting.setting}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs
index 22b35fd33a8..b92b5d6b2c0 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/uploaded-image-list.hbs
@@ -1,3 +1,3 @@
-<DButton @label="admin.site_settings.uploaded_image_list.label" @action={{action "showUploadModal"}} @actionParam={{hash value=value setting=setting}} />
-<div class="desc">{{html-safe setting.description}}</div>
-<SettingValidationMessage @message={{validationMessage}} />
+<DButton @label="admin.site_settings.uploaded_image_list.label" @action={{action "showUploadModal"}} @actionParam={{hash value=this.value setting=this.setting}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
+<SettingValidationMessage @message={{this.validationMessage}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs
index b9f79d51b05..db8e98b37eb 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/url-list.hbs
@@ -1,3 +1,3 @@
-<ValueList @values={{value}} @addKey="admin.site_settings.add_url" />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<ValueList @values={{this.value}} @addKey="admin.site_settings.add_url" />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs
index 3265f00790c..88483d6d98f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-settings/value-list.hbs
@@ -1,3 +1,3 @@
-<ValueList @values={{value}} />
-<SettingValidationMessage @message={{validationMessage}} />
-<div class="desc">{{html-safe setting.description}}</div>
+<ValueList @values={{this.value}} />
+<SettingValidationMessage @message={{this.validationMessage}} />
+<div class="desc">{{html-safe this.setting.description}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs b/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs
index 181e885f680..342f6854c00 100644
--- a/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/site-text-summary.hbs
@@ -1,5 +1,5 @@
-<DButton @label="admin.site_text.edit" @class="btn-default edit" @action={{editAction}} @actionParam={{siteText}} />
-<h3 class="site-text-id">{{siteText.id}}</h3>
-<div class="site-text-value">{{siteText.value}}</div>
+<DButton @label="admin.site_text.edit" @class="btn-default edit" @action={{this.editAction}} @actionParam={{this.siteText}} />
+<h3 class="site-text-id">{{this.siteText.id}}</h3>
+<div class="site-text-value">{{this.siteText.value}}</div>
 
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs b/app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs
index 309e9206848..b52d28eda0b 100644
--- a/app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/suspension-details.hbs
@@ -1,7 +1,7 @@
 <div class="reason-controls">
   <label>
     <div class="suspend-reason-label">
-      {{#if siteSettings.hide_suspension_reasons}}
+      {{#if this.siteSettings.hide_suspension_reasons}}
         {{html-safe (i18n "admin.user.suspend_reason_hidden_label")}}
       {{else}}
         {{html-safe (i18n "admin.user.suspend_reason_label")}}
@@ -11,9 +11,9 @@
   <label>
     {{i18n "admin.user.suspend_reason_title"}}
   </label>
-  <ComboBox @content={{reasons}} @value={{selectedReason}} @class="suspend-reason" @onChange={{action setSelectedReason}} />
-  {{#if isCustomReason}}
-    <TextField @value={{customReason}} @class="suspend-reason" @onChange={{action setCustomReason}} />
+  <ComboBox @content={{this.reasons}} @value={{this.selectedReason}} @class="suspend-reason" @onChange={{action this.setSelectedReason}} />
+  {{#if this.isCustomReason}}
+    <TextField @value={{this.customReason}} @class="suspend-reason" @onChange={{action this.setCustomReason}} />
   {{/if}}
 </div>
 
@@ -22,4 +22,4 @@
     {{i18n "admin.user.suspend_message"}}
   </div>
 </label>
-<Textarea @value={{message}} class="suspend-message" placeholder={{i18n "admin.user.suspend_message_placeholder"}} />
+<Textarea @value={{this.message}} class="suspend-message" placeholder={{i18n "admin.user.suspend_message_placeholder"}} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
index 4ab018c5e9f..8a0897d2026 100644
--- a/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/tags-uploader.hbs
@@ -1,6 +1,6 @@
-<label class="btn btn-default {{if addDisabled "disabled"}}">
+<label class="btn btn-default {{if this.addDisabled "disabled"}}">
   {{d-icon "upload"}}
   {{i18n "admin.watched_words.form.upload"}}
-  <input class="hidden-upload-field" disabled={{addDisabled}} type="file" accept="text/plain,text/csv">
+  <input class="hidden-upload-field" disabled={{this.addDisabled}} type="file" accept="text/plain,text/csv">
 </label>
 <span class="instructions">{{i18n "tagging.upload_instructions"}}</span>
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
index c1c9e7fced3..1710a14454f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list-item.hbs
@@ -1,41 +1,41 @@
 <div class="inner-wrapper">
-  <PluginOutlet @name="admin-customize-themes-list-item" @tagName="span" @connectorTagName="span" @args={{hash theme=theme}} />
+  <PluginOutlet @name="admin-customize-themes-list-item" @tagName="span" @connectorTagName="span" @args={{hash theme=this.theme}} />
 
   <div class="info">
     <span class="name">
-      {{theme.name}}
+      {{this.theme.name}}
     </span>
 
     <span class="icons">
-      {{#if theme.selected}}
+      {{#if this.theme.selected}}
         {{d-icon "caret-right"}}
       {{else}}
-        {{#if theme.default}}
+        {{#if this.theme.default}}
           {{d-icon "check" class="default-indicator" title="admin.customize.theme.default_theme_tooltip"}}
         {{/if}}
-        {{#if theme.isPendingUpdates}}
+        {{#if this.theme.isPendingUpdates}}
           {{d-icon "sync" title="admin.customize.theme.updates_available_tooltip" class="light-grey-icon"}}
         {{/if}}
-        {{#if theme.isBroken}}
+        {{#if this.theme.isBroken}}
           {{d-icon "exclamation-circle" class="broken-indicator" title="admin.customize.theme.broken_theme_tooltip"}}
         {{/if}}
-        {{#unless theme.enabled}}
+        {{#unless this.theme.enabled}}
           {{d-icon "ban" class="light-grey-icon" title="admin.customize.theme.disabled_component_tooltip"}}
         {{/unless}}
       {{/if}}
     </span>
   </div>
 
-  {{#if displayComponents}}
+  {{#if this.displayComponents}}
     <div class="components-list">
-      <span class="components">{{html-safe childrenString}}</span>
+      <span class="components">{{html-safe this.childrenString}}</span>
 
-      {{#if displayHasMore}}
+      {{#if this.displayHasMore}}
         <a href {{action "toggleChildrenExpanded"}} class="others-count">
-          {{#if childrenExpanded}}
+          {{#if this.childrenExpanded}}
             {{i18n "admin.customize.theme.collapse"}}
           {{else}}
-            {{i18n "admin.customize.theme.and_x_more" count=moreCount}}
+            {{i18n "admin.customize.theme.and_x_more" count=this.moreCount}}
           {{/if}}
         </a>
       {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
index 6c268550975..378c6837a09 100644
--- a/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/themes-list.hbs
@@ -1,25 +1,25 @@
 <div class="themes-list-header">
-  <DButton @action={{action "changeView"}} @actionParam={{THEMES}} @class={{concat "themes-tab " "tab " (if themesTabActive "btn-danger active" "")}} @label="admin.customize.theme.title" />
-  <DButton @action={{action "changeView"}} @actionParam={{COMPONENTS}} @class={{concat "components-tab " "tab " (if componentsTabActive "btn-danger active" "")}} @label="admin.customize.theme.components" @icon="puzzle-piece" />
+  <DButton @action={{action "changeView"}} @actionParam={{this.THEMES}} @class={{concat "themes-tab " "tab " (if this.themesTabActive "btn-danger active" "")}} @label="admin.customize.theme.title" />
+  <DButton @action={{action "changeView"}} @actionParam={{this.COMPONENTS}} @class={{concat "components-tab " "tab " (if this.componentsTabActive "btn-danger active" "")}} @label="admin.customize.theme.components" @icon="puzzle-piece" />
 </div>
 
 <div class="themes-list-container">
-  {{#if showFilter}}
+  {{#if this.showFilter}}
     <div class="themes-list-filter themes-list-item">
-      <Input class="filter-input" placeholder={{i18n "admin.customize.theme.filter_placeholder"}} @autocomplete="off" @type="search" @value={{mut filterTerm}} />
+      <Input class="filter-input" placeholder={{i18n "admin.customize.theme.filter_placeholder"}} @autocomplete="off" @type="search" @value={{mut this.filterTerm}} />
       {{d-icon "search"}}
     </div>
   {{/if}}
-  {{#if hasThemes}}
-    {{#if hasActiveThemes}}
-      {{#each activeThemes as |theme|}}
+  {{#if this.hasThemes}}
+    {{#if this.hasActiveThemes}}
+      {{#each this.activeThemes as |theme|}}
         <ThemesListItem @theme={{theme}} @navigateToTheme={{action "navigateToTheme" theme}} />
       {{/each}}
 
-      {{#if hasInactiveThemes}}
+      {{#if this.hasInactiveThemes}}
         <div class="themes-list-item inactive-indicator">
           <span class="empty">
-            {{#if themesTabActive}}
+            {{#if this.themesTabActive}}
               {{i18n "admin.customize.theme.inactive_themes"}}
             {{else}}
               {{i18n "admin.customize.theme.inactive_components"}}
@@ -29,8 +29,8 @@
       {{/if}}
     {{/if}}
 
-    {{#if hasInactiveThemes}}
-      {{#each inactiveThemes as |theme|}}
+    {{#if this.hasInactiveThemes}}
+      {{#each this.inactiveThemes as |theme|}}
         <ThemesListItem @theme={{theme}} @navigateToTheme={{action "navigateToTheme" theme}} />
       {{/each}}
     {{/if}}
@@ -42,5 +42,5 @@
 </div>
 
 <div class="create-actions">
-  <DButton @action={{installModal}} @icon="upload" @label="admin.customize.install" @class="btn-primary" />
+  <DButton @action={{this.installModal}} @icon="upload" @label="admin.customize.install" @class="btn-primary" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/value-list.hbs b/app/assets/javascripts/admin/addon/templates/components/value-list.hbs
index 03e6a72ff34..265018d7f1f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/value-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/value-list.hbs
@@ -1,12 +1,12 @@
-{{#if collection}}
+{{#if this.collection}}
   <div class="values">
-    {{#each collection as |value index|}}
+    {{#each this.collection as |value index|}}
       <div data-index={{index}} class="value">
         <DButton @action={{action "removeValue"}} @actionParam={{value}} @icon="times" @class="remove-value-btn btn-small" />
 
         <Input @title={{value}} @value={{value}} class="value-input" @focus-out={{action "changeValue" index}} />
 
-        {{#if showUpDownButtons}}
+        {{#if this.showUpDownButtons}}
           <DButton @action={{action "shift" -1 index}} @icon="arrow-up" @class="shift-up-value-btn btn-small" />
           <DButton @action={{action "shift" 1 index}} @icon="arrow-down" @class="shift-down-value-btn btn-small" />
         {{/if}}
@@ -15,7 +15,7 @@
   </div>
 {{/if}}
 
-<ComboBox @valueProperty={{null}} @nameProperty={{null}} @value={{newValue}} @content={{filteredChoices}} @onChange={{action "selectChoice"}} @options={{hash
+<ComboBox @valueProperty={{null}} @nameProperty={{null}} @value={{this.newValue}} @content={{this.filteredChoices}} @onChange={{action "selectChoice"}} @options={{hash
     allowAny=true
-    none=noneKey
+    none=this.noneKey
   }} />
diff --git a/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs b/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs
index 0d5208c1716..aed2cdf3698 100644
--- a/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/version-checks.hbs
@@ -6,26 +6,26 @@
 
 <div
   class="dashboard-stats version-check
-    {{if versionCheck.critical_updates "critical" "normal"}}"
+    {{if this.versionCheck.critical_updates "critical" "normal"}}"
 >
   <div class="version-number">
     <h4>
       {{i18n "admin.dashboard.installed_version"}}
     </h4>
     <h3>
-      {{dash-if-empty versionCheck.installed_version}}
+      {{dash-if-empty this.versionCheck.installed_version}}
     </h3>
-    {{#if versionCheck.gitLink}}
+    {{#if this.versionCheck.gitLink}}
       <div class="sha-link">
         (
-        <a href={{versionCheck.gitLink}} rel="noopener noreferrer" target="_blank">
-          {{versionCheck.shortSha}}
+        <a href={{this.versionCheck.gitLink}} rel="noopener noreferrer" target="_blank">
+          {{this.versionCheck.shortSha}}
         </a>
         )
       </div>
     {{/if}}
   </div>
-  {{#if versionCheck.noCheckPerformed}}
+  {{#if this.versionCheck.noCheckPerformed}}
     <div class="version-number">
       <h4>
         {{i18n "admin.dashboard.latest_version"}}
@@ -46,20 +46,20 @@
         </span>
       </div>
     </div>
-  {{else if versionCheck.stale_data}}
+  {{else if this.versionCheck.stale_data}}
     <div class="version-number">
       <h4>
         {{i18n "admin.dashboard.latest_version"}}
       </h4>
       <h3>
-        {{#if versionCheck.version_check_pending}}
-          {{dash-if-empty versionCheck.installed_version}}
+        {{#if this.versionCheck.version_check_pending}}
+          {{dash-if-empty this.versionCheck.installed_version}}
         {{/if}}
       </h3>
     </div>
     <div class="version-status">
       <div class="face">
-        {{#if versionCheck.version_check_pending}}
+        {{#if this.versionCheck.version_check_pending}}
           <span class="icon up-to-date">
             {{d-icon "far-smile"}}
           </span>
@@ -71,7 +71,7 @@
       </div>
       <div class="version-notes">
         <span class="normal-note">
-          {{#if versionCheck.version_check_pending}}
+          {{#if this.versionCheck.version_check_pending}}
             {{i18n "admin.dashboard.version_check_pending"}}
           {{else}}
             {{i18n "admin.dashboard.stale_data"}}
@@ -85,12 +85,12 @@
         {{i18n "admin.dashboard.latest_version"}}
       </h4>
       <h3>
-        {{dash-if-empty versionCheck.latest_version}}
+        {{dash-if-empty this.versionCheck.latest_version}}
       </h3>
     </div>
     <div class="version-status">
       <div class="face">
-        {{#if versionCheck.upToDate}}
+        {{#if this.versionCheck.upToDate}}
           <span class="icon up-to-date">
             {{d-icon "far-smile"}}
           </span>
@@ -98,12 +98,12 @@
           <span
             class="icon
               {{if
-                versionCheck.critical_updates
+                this.versionCheck.critical_updates
                 "critical-updates-available"
                 "updates-available"
               }}"
           >
-            {{#if versionCheck.behindByOneVersion}}
+            {{#if this.versionCheck.behindByOneVersion}}
               {{d-icon "far-meh"}}
             {{else}}
               {{d-icon "far-frown"}}
@@ -112,7 +112,7 @@
         {{/if}}
       </div>
       <div class="version-notes">
-        {{#if versionCheck.upToDate}}
+        {{#if this.versionCheck.upToDate}}
           {{i18n "admin.dashboard.up_to_date"}}
         {{else}}
           <span class="critical-note">
@@ -126,5 +126,5 @@
       </div>
     </div>
   {{/if}}
-  <CustomHtml @name="upgrade-header" @versionCheck={{versionCheck}} @tagName="div" @classNames="upgrade-header" />
+  <CustomHtml @name="upgrade-header" @versionCheck={{this.versionCheck}} @tagName="div" @classNames="upgrade-header" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
index c459a42d49b..e7f4434463c 100644
--- a/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/watched-word-form.hbs
@@ -1,34 +1,34 @@
 <div class="watched-word-input">
   <label for="watched-word">{{i18n "admin.watched_words.form.label"}}</label>
-  <TextField @id="watched-word" @value={{word}} @disabled={{formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey={{placeholderKey}} @title={{i18n placeholderKey}} />
+  <TextField @id="watched-word" @value={{this.word}} @disabled={{this.formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey={{this.placeholderKey}} @title={{i18n this.placeholderKey}} />
 </div>
 
-{{#if canReplace}}
+{{#if this.canReplace}}
   <div class="watched-word-input">
     <label for="watched-replacement">{{i18n "admin.watched_words.form.replace_label"}}</label>
-    <TextField @id="watched-replacement" @value={{replacement}} @disabled={{formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey="admin.watched_words.form.replace_placeholder" />
+    <TextField @id="watched-replacement" @value={{this.replacement}} @disabled={{this.formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey="admin.watched_words.form.replace_placeholder" />
   </div>
 {{/if}}
 
-{{#if canTag}}
+{{#if this.canTag}}
   <div class="watched-word-input">
     <label for="watched-tag">{{i18n "admin.watched_words.form.tag_label"}}</label>
-    <TagChooser @id="watched-tag" @class="watched-word-input-field" @tags={{selectedTags}} @onChange={{action "changeSelectedTags"}} @everyTag={{true}} @options={{hash
+    <TagChooser @id="watched-tag" @class="watched-word-input-field" @tags={{this.selectedTags}} @onChange={{action "changeSelectedTags"}} @everyTag={{true}} @options={{hash
         allowAny=true
-        disabled=formSubmitted
+        disabled=this.formSubmitted
       }} />
   </div>
 {{/if}}
 
-{{#if canLink}}
+{{#if this.canLink}}
   <div class="watched-word-input">
     <label for="watched-replacement">{{i18n "admin.watched_words.form.link_label"}}</label>
-    <TextField @id="watched-replacement" @value={{replacement}} @disabled={{formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey="admin.watched_words.form.link_placeholder" />
+    <TextField @id="watched-replacement" @value={{this.replacement}} @disabled={{this.formSubmitted}} @class="watched-word-input-field" @autocorrect="off" @autocapitalize="off" @placeholderKey="admin.watched_words.form.link_placeholder" />
   </div>
 {{/if}}
 
-<DButton @class="btn btn-primary" @action={{action "submit"}} @disabled={{formSubmitted}} @label="admin.watched_words.form.add" />
+<DButton @class="btn btn-primary" @action={{action "submit"}} @disabled={{this.formSubmitted}} @label="admin.watched_words.form.add" />
 
-{{#if showMessage}}
-  <span class="success-message">{{message}}</span>
+{{#if this.showMessage}}
+  <span class="success-message">{{this.message}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs b/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
index 41c4920d637..f66222be857 100644
--- a/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/watched-word-uploader.hbs
@@ -1,5 +1,5 @@
-<label class="btn btn-default {{if addDisabled "disabled"}}">
+<label class="btn btn-default {{if this.addDisabled "disabled"}}">
   {{d-icon "upload"}}
   {{i18n "admin.watched_words.form.upload"}}
-  <input class="hidden-upload-field" disabled={{addDisabled}} type="file">
+  <input class="hidden-upload-field" disabled={{this.addDisabled}} type="file">
 </label>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
index b5ffc2413f5..8bc3a9a301a 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
@@ -1,17 +1,17 @@
 <div class="color-scheme show-current-style">
   <div class="admin-container">
-    <h1>{{#if model.theme_id}}{{model.name}}{{else}}<TextField @class="style-name" @value={{model.name}} />{{/if}}</h1>
+    <h1>{{#if this.model.theme_id}}{{this.model.name}}{{else}}<TextField @class="style-name" @value={{this.model.name}} />{{/if}}</h1>
     <div class="controls">
-      {{#unless model.theme_id}}
-        <DButton @class="btn-primary" @action={{action "save"}} @disabled={{model.disableSave}} @label="admin.customize.save" />
+      {{#unless this.model.theme_id}}
+        <DButton @class="btn-primary" @action={{action "save"}} @disabled={{this.model.disableSave}} @label="admin.customize.save" />
       {{/unless}}
-      <DButton @class="btn-default" @action={{action "copy" model}} @icon="copy" @label="admin.customize.copy" />
-      <DButton @class="btn-default copy-to-clipboard" @action={{action "copyToClipboard" model}} @icon="far-clipboard" @label="admin.customize.copy_to_clipboard" />
-      <span class="saving {{unless model.savingStatus "hidden"}}">{{model.savingStatus}}</span>
-      {{#if model.theme_id}}
+      <DButton @class="btn-default" @action={{action "copy" this.model}} @icon="copy" @label="admin.customize.copy" />
+      <DButton @class="btn-default copy-to-clipboard" @action={{action "copyToClipboard" this.model}} @icon="far-clipboard" @label="admin.customize.copy_to_clipboard" />
+      <span class="saving {{unless this.model.savingStatus "hidden"}}">{{this.model.savingStatus}}</span>
+      {{#if this.model.theme_id}}
         <span class="not-editable">
           {{i18n "admin.customize.theme_owner"}}
-          <LinkTo @route="adminCustomizeThemes.show" @model={{model.theme_id}}>{{model.theme_name}}</LinkTo>
+          <LinkTo @route="adminCustomizeThemes.show" @model={{this.model.theme_id}}>{{this.model.theme_name}}</LinkTo>
         </span>
       {{else}}
         <DButton @action={{action "destroy"}} @class="btn-danger" @icon="far-trash-alt" @label="admin.customize.delete" />
@@ -19,28 +19,28 @@
     </div>
 
     <div class="admin-controls">
-      {{#unless model.theme_id}}
+      {{#unless this.model.theme_id}}
         <div class="pull-right">
           <label>
-            <Input @type="checkbox" @checked={{onlyOverridden}} />
+            <Input @type="checkbox" @checked={{this.onlyOverridden}} />
             {{i18n "admin.settings.show_overriden"}}
           </label>
         </div>
       {{/unless}}
 
       <div>
-        {{#if model.theme_id}}
-          <InlineEditCheckbox @action={{action "applyUserSelectable"}} @labelKey="admin.customize.theme.color_scheme_user_selectable" @checked={{model.user_selectable}} @modelId={{model.id}} />
+        {{#if this.model.theme_id}}
+          <InlineEditCheckbox @action={{action "applyUserSelectable"}} @labelKey="admin.customize.theme.color_scheme_user_selectable" @checked={{this.model.user_selectable}} @modelId={{this.model.id}} />
         {{else}}
           <label>
-            <Input @type="checkbox" @checked={{model.user_selectable}} />
+            <Input @type="checkbox" @checked={{this.model.user_selectable}} />
             {{i18n "admin.customize.theme.color_scheme_user_selectable"}}
           </label>
         {{/if}}
       </div>
     </div>
 
-    {{#if colors.length}}
+    {{#if this.colors.length}}
       <table class="table colors">
         <thead>
           <tr>
@@ -50,7 +50,7 @@
           </tr>
         </thead>
         <tbody>
-          {{#each colors as |c|}}
+          {{#each this.colors as |c|}}
             <tr class="{{if c.changed "changed"}} {{if c.valid "valid" "invalid"}}">
               <td class="name" title={{c.name}}>
                 <h3>{{c.translatedName}}</h3>
@@ -58,7 +58,7 @@
               </td>
               <td class="hex"><ColorInput @hexValue={{c.hex}} @brightnessValue={{c.brightness}} @valid={{c.valid}} /></td>
               <td class="actions">
-                {{#unless model.theme_id}}
+                {{#unless this.model.theme_id}}
                   <DButton @class={{concat "btn-default revert " (unless c.savedIsOverriden "invisible")}} @action={{action "revert" c}} @title="admin.customize.colors.revert_title" @label="revert" />
                   <DButton @class={{concat "btn-default undo " (unless c.changed "invisible")}} @action={{action "undo" c}} @title="admin.customize.colors.undo_title" @label="undo" />
                 {{/unless}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
index 0c64ee1e26d..8d823051b75 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-colors.hbs
@@ -2,7 +2,7 @@
   <h3>{{i18n "admin.customize.colors.long_title"}}</h3>
 
   <ul>
-    {{#each model as |scheme|}}
+    {{#each this.model as |scheme|}}
       {{#unless scheme.is_base}}
         <li>
           <LinkTo @route="adminCustomize.colors.show" @model={{scheme}} @replace={{true}}>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
index 0d3dbab7416..ae450274472 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-email-style-edit.hbs
@@ -1,7 +1,7 @@
-<EmailStylesEditor @styles={{model}} @fieldName={{fieldName}} @save={{action "save"}} />
+<EmailStylesEditor @styles={{this.model}} @fieldName={{this.fieldName}} @save={{action "save"}} />
 
 <div class="admin-footer">
   <div class="buttons">
-    <DButton @action={{action "save"}} @disabled={{saveDisabled}} @class="btn-primary" @translatedLabel={{saveButtonText}} />
+    <DButton @action={{action "save"}} @disabled={{this.saveDisabled}} @class="btn-primary" @translatedLabel={{this.saveButtonText}} />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs
index 0a90f0b6486..f36ff2a8f4a 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-email-templates-edit.hbs
@@ -1,19 +1,19 @@
-<ComboBox @value={{emailTemplate.id}} @content={{adminCustomizeEmailTemplates.sortedTemplates}} @onChange={{adminCustomizeEmailTemplates.onSelectTemplate}} @nameProperty="title" />
+<ComboBox @value={{this.emailTemplate.id}} @content={{this.adminCustomizeEmailTemplates.sortedTemplates}} @onChange={{this.adminCustomizeEmailTemplates.onSelectTemplate}} @nameProperty="title" />
 
 <div class="email-template">
   <label>{{i18n "admin.customize.email_templates.subject"}}</label>
-  {{#if hasMultipleSubjects}}
-    <h3><LinkTo @route="adminSiteText" @query={{hash q=hasMultipleSubjects}}>{{i18n "admin.customize.email_templates.multiple_subjects"}}</LinkTo></h3>
+  {{#if this.hasMultipleSubjects}}
+    <h3><LinkTo @route="adminSiteText" @query={{hash q=this.hasMultipleSubjects}}>{{i18n "admin.customize.email_templates.multiple_subjects"}}</LinkTo></h3>
   {{else}}
-    <Input @value={{buffered.subject}} />
+    <Input @value={{this.buffered.subject}} />
   {{/if}}
   <br>
 
   <label>{{i18n "admin.customize.email_templates.body"}}</label>
-  <DEditor @value={{buffered.body}} />
+  <DEditor @value={{this.buffered.body}} />
 
-  <SaveControls @model={{emailTemplate}} @action={{action "saveChanges"}} @saved={{saved}} @saveDisabled={{saveDisabled}}>
-    {{#if emailTemplate.can_revert}}
+  <SaveControls @model={{this.emailTemplate}} @action={{action "saveChanges"}} @saved={{this.saved}} @saveDisabled={{this.saveDisabled}}>
+    {{#if this.emailTemplate.can_revert}}
       <DButton @action={{action "revertChanges"}} @label="admin.customize.email_templates.revert" />
     {{/if}}
   </SaveControls>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
index 539f9c98ea7..fb81caada35 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-robots-txt.hbs
@@ -1,13 +1,13 @@
 <div class="robots-txt-edit">
   <h3>{{i18n "admin.customize.robots.title"}}</h3>
   <p>{{i18n "admin.customize.robots.warning"}}</p>
-  {{#if model.overridden}}
+  {{#if this.model.overridden}}
     <div class="overridden">
       {{i18n "admin.customize.robots.overridden"}}
     </div>
   {{/if}}
-  <Textarea @value={{buffered.robots_txt}} class="robots-txt-input" />
-  <SaveControls @model={{this}} @action={{action "save"}} @saved={{saved}} @saveDisabled={{saveDisabled}}>
-    <DButton @class="btn-default" @disabled={{resetDisabled}} @icon="undo" @action={{action "reset"}} @label="admin.settings.reset" />
+  <Textarea @value={{this.buffered.robots_txt}} class="robots-txt-input" />
+  <SaveControls @model={{this}} @action={{action "save"}} @saved={{this.saved}} @saveDisabled={{this.saveDisabled}}>
+    <DButton @class="btn-default" @disabled={{this.resetDisabled}} @icon="undo" @action={{action "reset"}} @label="admin.settings.reset" />
   </SaveControls>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
index e0c81b56faa..a2f1aa6ebc7 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-edit.hbs
@@ -1,23 +1,23 @@
-<div class="current-style {{if maximized "maximized"}}">
+<div class="current-style {{if this.maximized "maximized"}}">
   <div class="wrapper">
     <div class="editor-information">
       <DButton @title="go_back" @action={{action "goBack"}} @icon="chevron-left" @class="btn-small editor-back-button" />
 
       <span class="editor-theme-name-wrapper">
         {{i18n "admin.customize.theme.edit_css_html"}}
-        <LinkTo @route={{showRouteName}} @model={{model.id}} @replace={{true}} class="editor-theme-name">
-          {{model.name}}
+        <LinkTo @route={{this.showRouteName}} @model={{this.model.id}} @replace={{true}} class="editor-theme-name">
+          {{this.model.name}}
         </LinkTo>
       </span>
     </div>
 
-    <AdminThemeEditor @theme={{model}} @editRouteName={{editRouteName}} @currentTargetName={{currentTargetName}} @fieldName={{fieldName}} @fieldAdded={{action "fieldAdded"}} @maximized={{maximized}} @onlyOverriddenChanged={{action "onlyOverriddenChanged"}} @save={{action "save"}} />
+    <AdminThemeEditor @theme={{this.model}} @editRouteName={{this.editRouteName}} @currentTargetName={{this.currentTargetName}} @fieldName={{this.fieldName}} @fieldAdded={{action "fieldAdded"}} @maximized={{this.maximized}} @onlyOverriddenChanged={{action "onlyOverriddenChanged"}} @save={{action "save"}} />
 
     <div class="admin-footer">
       <div class="status-actions">
-        {{#unless model.changed}}
+        {{#unless this.model.changed}}
           <a
-            href={{previewUrl}}
+            href={{this.previewUrl}}
             rel="noopener noreferrer"
             title={{i18n "admin.customize.explain_preview"}}
             class="preview-link"
@@ -29,7 +29,7 @@
       </div>
 
       <div class="buttons">
-        <DButton @action={{action "save"}} @disabled={{saveDisabled}} @class="btn-primary" @translatedLabel={{saveButtonText}} />
+        <DButton @action={{action "save"}} @disabled={{this.saveDisabled}} @class="btn-primary" @translatedLabel={{this.saveButtonText}} />
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
index e8ddd77ae31..41428e3fca6 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-index.hbs
@@ -1,12 +1,12 @@
 <div class="themes-intro admin-intro">
-  <img src={{womanArtistEmojiURL}} alt={{i18n "admin.customize.theme.themes_intro_emoji"}}>
+  <img src={{this.womanArtistEmojiURL}} alt={{i18n "admin.customize.theme.themes_intro_emoji"}}>
   <div class="content-wrapper">
     <h1>{{i18n "admin.customize.theme.themes_intro"}}</h1>
     <div class="create-actions">
       <DButton @action={{route-action "installModal"}} @icon="upload" @label="admin.customize.install" @class="btn-primary" />
     </div>
     <div class="external-resources">
-      {{#each externalResources as |resource|}}
+      {{#each this.externalResources as |resource|}}
         <a href={{resource.link}} class="external-link" rel="noopener noreferrer" target="_blank">
           {{d-icon resource.icon}}
           {{i18n resource.key}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
index 92fecd210b7..31690ff15f4 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes-show.hbs
@@ -1,41 +1,41 @@
 <div class="show-current-style">
-  <PluginOutlet @name="admin-customize-themes-show-top" @tagName="span" @connectorTagName="div" @args={{hash theme=model}} />
+  <PluginOutlet @name="admin-customize-themes-show-top" @tagName="span" @connectorTagName="div" @args={{hash theme=this.model}} />
   <div class="title">
-    {{#if editingName}}
-      <TextField @value={{model.name}} @autofocus="true" />
+    {{#if this.editingName}}
+      <TextField @value={{this.model.name}} @autofocus="true" />
       <DButton @action={{action "finishedEditingName"}} @class="btn-primary btn-small submit-edit" @icon="check" />
       <DButton @action={{action "cancelEditingName"}} @class="btn-small cancel-edit" @icon="times" />
     {{else}}
-      <span>{{model.name}}</span>
+      <span>{{this.model.name}}</span>
       <DButton @action={{action "startEditingName"}} @icon="pencil-alt" @class="btn-small" />
     {{/if}}
   </div>
 
-  {{#each model.errors as |error|}}
+  {{#each this.model.errors as |error|}}
     <div class="alert alert-error">{{error}}</div>
   {{/each}}
 
-  {{#unless model.supported}}
+  {{#unless this.model.supported}}
     <div class="alert alert-error">
       {{i18n "admin.customize.theme.required_version.error"}}
-      {{#if model.remote_theme.minimum_discourse_version}}
-        {{i18n "admin.customize.theme.required_version.minimum" version=model.remote_theme.minimum_discourse_version}}
+      {{#if this.model.remote_theme.minimum_discourse_version}}
+        {{i18n "admin.customize.theme.required_version.minimum" version=this.model.remote_theme.minimum_discourse_version}}
       {{/if}}
-      {{#if model.remote_theme.maximum_discourse_version}}
-        {{i18n "admin.customize.theme.required_version.maximum" version=model.remote_theme.maximum_discourse_version}}
+      {{#if this.model.remote_theme.maximum_discourse_version}}
+        {{i18n "admin.customize.theme.required_version.maximum" version=this.model.remote_theme.maximum_discourse_version}}
       {{/if}}
     </div>
   {{/unless}}
 
-  {{#unless model.enabled}}
+  {{#unless this.model.enabled}}
     <div class="alert alert-error">
-      {{#if model.disabled_by}}
+      {{#if this.model.disabled_by}}
         {{i18n "admin.customize.theme.disabled_by"}}
-        <UserLink @user={{model.disabled_by}}>
-          {{avatar model.disabled_by imageSize="tiny"}}
-          {{model.disabled_by.username}}
+        <UserLink @user={{this.model.disabled_by}}>
+          {{avatar this.model.disabled_by imageSize="tiny"}}
+          {{this.model.disabled_by.username}}
         </UserLink>
-        {{format-date model.disabled_at leaveAgo="true"}}
+        {{format-date this.model.disabled_at leaveAgo="true"}}
       {{else}}
         {{i18n "admin.customize.theme.disabled"}}
       {{/if}}
@@ -44,72 +44,72 @@
   {{/unless}}
 
   <div class="metadata control-unit">
-    {{#if model.remote_theme}}
-      {{#if model.remote_theme.remote_url}}
-        {{#if sourceIsHttp}}
-          <a class="remote-url" href={{remoteThemeLink}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
+    {{#if this.model.remote_theme}}
+      {{#if this.model.remote_theme.remote_url}}
+        {{#if this.sourceIsHttp}}
+          <a class="remote-url" href={{this.remoteThemeLink}}>{{i18n "admin.customize.theme.source_url"}}{{d-icon "link"}}</a>
         {{else}}
           <div class="remote-url">
-            <code>{{model.remote_theme.remote_url}}</code>
-            {{#if model.remote_theme.branch}}
-              (<code>{{model.remote_theme.branch}}</code>)
+            <code>{{this.model.remote_theme.remote_url}}</code>
+            {{#if this.model.remote_theme.branch}}
+              (<code>{{this.model.remote_theme.branch}}</code>)
             {{/if}}
           </div>
         {{/if}}
       {{/if}}
-      {{#if model.remote_theme.about_url}}
-        <a class="url about-url" href={{model.remote_theme.about_url}}>{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
+      {{#if this.model.remote_theme.about_url}}
+        <a class="url about-url" href={{this.model.remote_theme.about_url}}>{{i18n "admin.customize.theme.about_theme"}}{{d-icon "link"}}</a>
       {{/if}}
-      {{#if model.remote_theme.license_url}}
-        <a class="url license-url" href={{model.remote_theme.license_url}}>{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
+      {{#if this.model.remote_theme.license_url}}
+        <a class="url license-url" href={{this.model.remote_theme.license_url}}>{{i18n "admin.customize.theme.license"}}{{d-icon "link"}}</a>
       {{/if}}
 
-      {{#if model.description}}
-        <span class="theme-description">{{model.description}}</span>
+      {{#if this.model.description}}
+        <span class="theme-description">{{this.model.description}}</span>
       {{/if}}
 
-      {{#if model.remote_theme.authors}}<span class="authors"><span class="heading">{{i18n "admin.customize.theme.authors"}}</span> {{model.remote_theme.authors}}</span>{{/if}}
-      {{#if model.remote_theme.theme_version}}<span class="version"><span class="heading">{{i18n "admin.customize.theme.version"}}</span> {{model.remote_theme.theme_version}}</span>{{/if}}
+      {{#if this.model.remote_theme.authors}}<span class="authors"><span class="heading">{{i18n "admin.customize.theme.authors"}}</span> {{this.model.remote_theme.authors}}</span>{{/if}}
+      {{#if this.model.remote_theme.theme_version}}<span class="version"><span class="heading">{{i18n "admin.customize.theme.version"}}</span> {{this.model.remote_theme.theme_version}}</span>{{/if}}
 
       <div class="control-unit">
-        {{#if model.remote_theme.is_git}}
+        {{#if this.model.remote_theme.is_git}}
           <div class="alert alert-info">
-            {{html-safe (i18n "admin.customize.theme.remote_theme_edits" repoURL=remoteThemeLink)}}
+            {{html-safe (i18n "admin.customize.theme.remote_theme_edits" repoURL=this.remoteThemeLink)}}
           </div>
 
-          {{#if showRemoteError}}
+          {{#if this.showRemoteError}}
             <div class="error-message">
               {{d-icon "exclamation-triangle"}} {{i18n "admin.customize.theme.repo_unreachable"}}
             </div>
             <div class="raw-error">
-              <code>{{model.remoteError}}</code>
+              <code>{{this.model.remoteError}}</code>
             </div>
           {{/if}}
 
-          {{#if model.remote_theme.commits_behind}}
+          {{#if this.model.remote_theme.commits_behind}}
             <DButton @action={{action "updateToLatest"}} @icon="download" @class="btn-primary" @label="admin.customize.theme.update_to_latest" />
           {{else}}
             <DButton @action={{action "checkForThemeUpdates"}} @icon="sync" @class="btn-default" @label="admin.customize.theme.check_for_updates" />
           {{/if}}
 
           <span class="status-message">
-            {{#if updatingRemote}}
+            {{#if this.updatingRemote}}
               {{i18n "admin.customize.theme.updating"}}
             {{else}}
-              {{#if model.remote_theme.commits_behind}}
-                {{#if hasOverwrittenHistory}}
+              {{#if this.model.remote_theme.commits_behind}}
+                {{#if this.hasOverwrittenHistory}}
                   {{i18n "admin.customize.theme.has_overwritten_history"}}
                 {{else}}
-                  {{i18n "admin.customize.theme.commits_behind" count=model.remote_theme.commits_behind}}
+                  {{i18n "admin.customize.theme.commits_behind" count=this.model.remote_theme.commits_behind}}
                 {{/if}}
-                {{#if model.remote_theme.github_diff_link}}
-                  <a href={{model.remote_theme.github_diff_link}}>
+                {{#if this.model.remote_theme.github_diff_link}}
+                  <a href={{this.model.remote_theme.github_diff_link}}>
                     {{i18n "admin.customize.theme.compare_commits"}}
                   </a>
                 {{/if}}
               {{else}}
-                {{#unless showRemoteError}}
-                  {{i18n "admin.customize.theme.up_to_date"}} {{format-date model.remote_theme.updated_at leaveAgo="true"}}
+                {{#unless this.showRemoteError}}
+                  {{i18n "admin.customize.theme.up_to_date"}} {{format-date this.model.remote_theme.updated_at leaveAgo="true"}}
                 {{/unless}}
               {{/if}}
             {{/if}}
@@ -123,40 +123,40 @@
     {{else}}
       <span class="heading">{{i18n "admin.customize.theme.creator"}}</span>
       <span>
-        <UserLink @user={{model.user}}>
-          {{format-username model.user.username}}
+        <UserLink @user={{this.model.user}}>
+          {{format-username this.model.user.username}}
         </UserLink>
       </span>
     {{/if}}
   </div>
 
-  {{#if showCheckboxes}}
+  {{#if this.showCheckboxes}}
     <div class="control-unit">
-      {{#unless model.component}}
-        <InlineEditCheckbox @action={{action "applyDefault"}} @labelKey="admin.customize.theme.is_default" @checked={{model.default}} @modelId={{model.id}} />
-        <InlineEditCheckbox @action={{action "applyUserSelectable"}} @labelKey="admin.customize.theme.user_selectable" @checked={{model.user_selectable}} @modelId={{model.id}} />
+      {{#unless this.model.component}}
+        <InlineEditCheckbox @action={{action "applyDefault"}} @labelKey="admin.customize.theme.is_default" @checked={{this.model.default}} @modelId={{this.model.id}} />
+        <InlineEditCheckbox @action={{action "applyUserSelectable"}} @labelKey="admin.customize.theme.user_selectable" @checked={{this.model.user_selectable}} @modelId={{this.model.id}} />
       {{/unless}}
-      {{#if model.remote_theme}}
-        <InlineEditCheckbox @action={{action "applyAutoUpdateable"}} @labelKey="admin.customize.theme.auto_update" @checked={{model.auto_update}} @modelId={{model.id}} />
+      {{#if this.model.remote_theme}}
+        <InlineEditCheckbox @action={{action "applyAutoUpdateable"}} @labelKey="admin.customize.theme.auto_update" @checked={{this.model.auto_update}} @modelId={{this.model.id}} />
       {{/if}}
     </div>
   {{/if}}
 
-  {{#unless model.component}}
+  {{#unless this.model.component}}
     <DSection @class="form-horizontal theme settings control-unit">
       <div class="row setting">
         <div class="setting-label">
           {{i18n "admin.customize.theme.color_scheme"}}
         </div>
         <div class="setting-value">
-          <ColorPalettes @content={{colorSchemes}} @value={{colorSchemeId}} @icon="paint-brush" @options={{hash
+          <ColorPalettes @content={{this.colorSchemes}} @value={{this.colorSchemeId}} @icon="paint-brush" @options={{hash
               filterable=true
             }} />
 
           <div class="desc">{{i18n "admin.customize.theme.color_scheme_select"}}</div>
         </div>
         <div class="setting-controls">
-          {{#if colorSchemeChanged}}
+          {{#if this.colorSchemeChanged}}
             <DButton @action={{action "changeScheme"}} @class="ok submit-edit" @icon="check" />
             <DButton @action={{action "cancelChangeScheme"}} @class="cancel cancel-edit" @icon="times" />
           {{/if}}
@@ -165,38 +165,38 @@
     </DSection>
   {{/unless}}
 
-  {{#if parentThemes}}
+  {{#if this.parentThemes}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.component_of"}}</div>
       <ul>
-        {{#each parentThemes as |theme|}}
+        {{#each this.parentThemes as |theme|}}
           <li><LinkTo @route="adminCustomizeThemes.show" @model={{theme}} @replace={{true}}>{{theme.name}}</LinkTo></li>
         {{/each}}
       </ul>
     </div>
   {{/if}}
 
-  {{#if model.component}}
+  {{#if this.model.component}}
     <DSection @class="form-horizontal theme settings control-unit">
       <div class="row setting">
-        <ThemeSettingRelativesSelector @setting={{relativesSelectorSettingsForComponent}} @model={{model}} @class="theme-setting" />
+        <ThemeSettingRelativesSelector @setting={{this.relativesSelectorSettingsForComponent}} @model={{this.model}} @class="theme-setting" />
       </div>
     </DSection>
   {{else}}
     <DSection @class="form-horizontal theme settings control-unit">
       <div class="row setting">
-        <ThemeSettingRelativesSelector @setting={{relativesSelectorSettingsForTheme}} @model={{model}} @class="theme-setting" />
+        <ThemeSettingRelativesSelector @setting={{this.relativesSelectorSettingsForTheme}} @model={{this.model}} @class="theme-setting" />
       </div>
     </DSection>
   {{/if}}
 
-  {{#unless model.remote_theme.is_git}}
+  {{#unless this.model.remote_theme.is_git}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.css_html"}}</div>
-      {{#if model.hasEditedFields}}
+      {{#if this.model.hasEditedFields}}
         <div class="description">{{i18n "admin.customize.theme.custom_sections"}}</div>
         <ul>
-          {{#each editedFieldsFormatted as |field|}}
+          {{#each this.editedFieldsFormatted as |field|}}
             <li>{{field}}</li>
           {{/each}}
         </ul>
@@ -211,9 +211,9 @@
 
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.uploads"}}</div>
-      {{#if model.uploads}}
+      {{#if this.model.uploads}}
         <ul class="removable-list">
-          {{#each model.uploads as |upload|}}
+          {{#each this.model.uploads as |upload|}}
             <li>
               <span class="col">${{upload.name}}: <a href={{upload.url}} rel="noopener noreferrer" target="_blank">{{upload.filename}}</a></span>
               <span class="col">
@@ -229,19 +229,19 @@
     </div>
   {{/unless}}
 
-  {{#if extraFiles.length}}
+  {{#if this.extraFiles.length}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.extra_files"}}</div>
       <details>
         <summary>
-          {{#if model.remote_theme}}
+          {{#if this.model.remote_theme}}
             {{i18n "admin.customize.theme.extra_files_remote"}}
           {{else}}
             {{i18n "admin.customize.theme.extra_files_upload"}}
           {{/if}}
         </summary>
         <ul>
-          {{#each extraFiles as |extraFile|}}
+          {{#each this.extraFiles as |extraFile|}}
             <li>{{extraFile.name}}</li>
           {{/each}}
         </ul>
@@ -249,23 +249,23 @@
     </div>
   {{/if}}
 
-  {{#if hasSettings}}
+  {{#if this.hasSettings}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.theme_settings"}}</div>
       <DSection @class="form-horizontal theme settings control-unit">
-        {{#each settings as |setting|}}
-          <ThemeSettingEditor @setting={{setting}} @model={{model}} @class="theme-setting control-unit" />
+        {{#each this.settings as |setting|}}
+          <ThemeSettingEditor @setting={{setting}} @model={{this.model}} @class="theme-setting control-unit" />
         {{/each}}
       </DSection>
     </div>
   {{/if}}
 
-  {{#if hasTranslations}}
+  {{#if this.hasTranslations}}
     <div class="control-unit">
       <div class="mini-title">{{i18n "admin.customize.theme.theme_translations"}}</div>
       <DSection @class="form-horizontal theme settings translations control-unit">
-        {{#each translations as |translation|}}
-          <ThemeTranslation @translation={{translation}} @model={{model}} @class="theme-translation" />
+        {{#each this.translations as |translation|}}
+          <ThemeTranslation @translation={{translation}} @model={{this.model}} @class="theme-translation" />
         {{/each}}
       </DSection>
     </div>
@@ -273,15 +273,15 @@
 
   <div class="theme-controls">
 
-    <a href={{previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener noreferrer" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
-    <a class="btn btn-default export" rel="noopener noreferrer" target="_blank" href={{downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
+    <a href={{this.previewUrl}} title={{i18n "admin.customize.explain_preview"}} rel="noopener noreferrer" target="_blank" class="btn btn-default">{{d-icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>
+    <a class="btn btn-default export" rel="noopener noreferrer" target="_blank" href={{this.downloadUrl}}>{{d-icon "download"}} {{i18n "admin.export_json.button_text"}}</a>
 
-    {{#if showConvert}}
-      <DButton @action={{action "switchType"}} @label="admin.customize.theme.convert" @icon={{convertIcon}} @class="btn-default btn-normal" @title={{convertTooltip}} />
+    {{#if this.showConvert}}
+      <DButton @action={{action "switchType"}} @label="admin.customize.theme.convert" @icon={{this.convertIcon}} @class="btn-default btn-normal" @title={{this.convertTooltip}} />
     {{/if}}
 
-    {{#if model.component}}
-      {{#if model.enabled}}
+    {{#if this.model.component}}
+      {{#if this.model.enabled}}
         <DButton @class="btn-default" @action={{action "disableComponent"}} @icon="ban" @label="admin.customize.theme.disable" />
       {{else}}
         <DButton @class="btn-default" @action={{action "enableComponent"}} @icon="check" @label="admin.customize.theme.enable" />
diff --git a/app/assets/javascripts/admin/addon/templates/customize-themes.hbs b/app/assets/javascripts/admin/addon/templates/customize-themes.hbs
index 8767606671f..e9321da239e 100644
--- a/app/assets/javascripts/admin/addon/templates/customize-themes.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize-themes.hbs
@@ -1,5 +1,5 @@
-{{#unless editingTheme}}
-  <ThemesList @themes={{fullThemes}} @components={{childThemes}} @currentTab={{currentTab}} @installModal={{route-action "installModal"}} />
+{{#unless this.editingTheme}}
+  <ThemesList @themes={{this.fullThemes}} @components={{this.childThemes}} @currentTab={{this.currentTab}} @installModal={{route-action "installModal"}} />
 {{/unless}}
 
 {{outlet}}
diff --git a/app/assets/javascripts/admin/addon/templates/customize.hbs b/app/assets/javascripts/admin/addon/templates/customize.hbs
index 2b192fb11b7..4be2ef08009 100644
--- a/app/assets/javascripts/admin/addon/templates/customize.hbs
+++ b/app/assets/javascripts/admin/addon/templates/customize.hbs
@@ -1,5 +1,5 @@
 <AdminNav>
-  {{#if currentUser.admin}}
+  {{#if this.currentUser.admin}}
     <NavItem @route="adminCustomizeThemes" @label="admin.customize.theme.title" @class="admin-customize-themes" />
     <NavItem @route="adminCustomize.colors" @label="admin.customize.colors.title" @class="admin-customize-colors" />
     <NavItem @route="adminSiteText" @label="admin.site_text.title" @class="admin-customize-site-text" />
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard.hbs b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
index 7eb39b55103..710778e90a8 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard.hbs
@@ -1,14 +1,14 @@
 <PluginOutlet @name="admin-dashboard-top" @tagName="span" @connectorTagName="div" />
 
-{{#if showVersionChecks}}
+{{#if this.showVersionChecks}}
   <div class="section-top">
     <div class="version-checks">
-      <VersionChecks @versionCheck={{versionCheck}} @tagName="" />
+      <VersionChecks @versionCheck={{this.versionCheck}} @tagName="" />
     </div>
   </div>
 {{/if}}
 
-<DashboardProblems @loadingProblems={{loadingProblems}} @foundProblems={{foundProblems}} @lowPriorityProblems={{lowPriorityProblems}} @highPriorityProblems={{highPriorityProblems}} @problemsTimestamp={{problemsTimestamp}} @refreshProblems={{action "refreshProblems"}} />
+<DashboardProblems @loadingProblems={{this.loadingProblems}} @foundProblems={{this.foundProblems}} @lowPriorityProblems={{this.lowPriorityProblems}} @highPriorityProblems={{this.highPriorityProblems}} @problemsTimestamp={{this.problemsTimestamp}} @refreshProblems={{action "refreshProblems"}} />
 
 <ul class="navigation">
   <li class="navigation-item general">
@@ -17,7 +17,7 @@
     </LinkTo>
   </li>
 
-  {{#if isModerationTabVisible}}
+  {{#if this.isModerationTabVisible}}
     <li class="navigation-item moderation">
       <LinkTo @route="admin.dashboardModeration" class="navigation-link">
         {{i18n "admin.dashboard.moderation_tab"}}
@@ -25,7 +25,7 @@
     </li>
   {{/if}}
 
-  {{#if isSecurityTabVisible}}
+  {{#if this.isSecurityTabVisible}}
     <li class="navigation-item security">
       <LinkTo @route="admin.dashboardSecurity" class="navigation-link">
         {{i18n "admin.dashboard.security_tab"}}
@@ -33,7 +33,7 @@
     </li>
   {{/if}}
 
-  {{#if isReportsTabVisible}}
+  {{#if this.isReportsTabVisible}}
     <li class="navigation-item reports">
       <LinkTo @route="admin.dashboardReports" class="navigation-link">
         {{i18n "admin.dashboard.reports_tab"}}
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
index 09bfa92a240..5b40b9ce5c9 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_general.hbs
@@ -1,7 +1,7 @@
-<ConditionalLoadingSpinner @condition={{isLoading}}>
+<ConditionalLoadingSpinner @condition={{this.isLoading}}>
   <PluginOutlet @name="admin-dashboard-general-top" @tagName="span" @connectorTagName="div" />
 
-  {{#if isCommunityHealthVisible}}
+  {{#if this.isCommunityHealthVisible}}
     <div class="community-health section">
       <div class="period-section">
         <div class="section-title">
@@ -10,24 +10,24 @@
               {{i18n "admin.dashboard.community_health"}}
             </a>
           </h2>
-          <PeriodChooser @period={{period}} @action={{action "changePeriod"}} @content={{availablePeriods}} @fullDay={{false}} />
+          <PeriodChooser @period={{this.period}} @action={{action "changePeriod"}} @content={{this.availablePeriods}} @fullDay={{false}} />
         </div>
 
         <div class="section-body">
           <div class="charts">
-            <AdminReport @dataSourceName="consolidated_page_views" @forcedModes="stacked-chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="consolidated_page_views" @forcedModes="stacked-chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="signups" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="signups" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="topics" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="topics" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="posts" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="posts" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="dau_by_mau" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="dau_by_mau" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="daily_engaged_users" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="daily_engaged_users" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
 
-            <AdminReport @dataSourceName="new_contributors" @showTrend={{true}} @forcedModes="chart" @filters={{filters}} />
+            <AdminReport @dataSourceName="new_contributors" @showTrend={{true}} @forcedModes="chart" @filters={{this.filters}} />
           </div>
         </div>
       </div>
@@ -36,8 +36,8 @@
 
   <div class="section-columns">
     <div class="section-column">
-      {{#if isActivityMetricsVisible}}
-        {{#if activityMetrics.length}}
+      {{#if this.isActivityMetricsVisible}}
+        {{#if this.activityMetrics.length}}
           <div class="admin-report activity-metrics">
             <div class="header">
               <ul class="breadcrumb">
@@ -58,8 +58,8 @@
                   <div class="counters-cell">{{i18n "admin.dashboard.reports.last_30_days"}}</div>
                 </div>
 
-                {{#each activityMetrics as |metric|}}
-                  <AdminReport @showHeader={{false}} @filters={{activityMetricsFilters}} @forcedModes="counters" @dataSourceName={{metric}} />
+                {{#each this.activityMetrics as |metric|}}
+                  <AdminReport @showHeader={{false}} @filters={{this.activityMetricsFilters}} @forcedModes="counters" @dataSourceName={{metric}} />
                 {{/each}}
               </div>
             </div>
@@ -68,7 +68,7 @@
       {{/if}}
 
       <div class="user-metrics">
-        <ConditionalLoadingSection @isLoading={{isLoading}}>
+        <ConditionalLoadingSection @isLoading={{this.isLoading}}>
           <AdminReport @forcedModes="inline-table" @dataSourceName="users_by_type" />
 
           <AdminReport @forcedModes="inline-table" @dataSourceName="users_by_trust_level" />
@@ -81,13 +81,13 @@
         <div class="last-dashboard-update">
           <div>
             <h4>{{i18n "admin.dashboard.last_updated"}} </h4>
-            <p>{{format-date model.attributes.updated_at leaveAgo="true"}}</p>
+            <p>{{format-date this.model.attributes.updated_at leaveAgo="true"}}</p>
           </div>
-          {{#if model.attributes.discourse_updated_at}}
+          {{#if this.model.attributes.discourse_updated_at}}
             <div>
               <h4>{{i18n "admin.dashboard.discourse_last_updated"}} </h4>
-              <p>{{format-date model.attributes.discourse_updated_at leaveAgo="true"}}</p>
-              <a rel="noopener noreferrer" target="_blank" href={{model.attributes.release_notes_link}} class="btn btn-default">
+              <p>{{format-date this.model.attributes.discourse_updated_at leaveAgo="true"}}</p>
+              <a rel="noopener noreferrer" target="_blank" href={{this.model.attributes.release_notes_link}} class="btn btn-default">
                 {{i18n "admin.dashboard.whats_new_in_discourse"}}
               </a>
             </div>
@@ -96,11 +96,11 @@
       </div>
     </div>
 
-    {{#if isSearchReportsVisible}}
+    {{#if this.isSearchReportsVisible}}
       <div class="section-column">
-        <AdminReport @filters={{topReferredTopicsFilters}} @dataSourceName="top_referred_topics" @reportOptions={{topReferredTopicsOptions}} />
+        <AdminReport @filters={{this.topReferredTopicsFilters}} @dataSourceName="top_referred_topics" @reportOptions={{this.topReferredTopicsOptions}} />
 
-        <AdminReport @dataSourceName="trending_search" @reportOptions={{trendingSearchOptions}} @filters={{trendingSearchFilters}} @isEnabled={{logSearchQueriesEnabled}} @disabledLabel={{trendingSearchDisabledLabel}} />
+        <AdminReport @dataSourceName="trending_search" @reportOptions={{this.trendingSearchOptions}} @filters={{this.trendingSearchFilters}} @isEnabled={{this.logSearchQueriesEnabled}} @disabledLabel={{this.trendingSearchDisabledLabel}} />
         {{html-safe (i18n "admin.dashboard.reports.trending_search.more" basePath=(base-path))}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
index 66032ad9b87..923b50d1e36 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_moderation.hbs
@@ -1,7 +1,7 @@
 <div class="sections">
   <PluginOutlet @name="admin-dashboard-moderation-top" @tagName="span" @connectorTagName="div" />
 
-  {{#if isModeratorsActivityVisible}}
+  {{#if this.isModeratorsActivityVisible}}
     <div class="moderators-activity section">
       <div class="section-title">
         <h2>
@@ -9,21 +9,21 @@
             {{i18n "admin.dashboard.moderators_activity"}}
           </a>
         </h2>
-        <PeriodChooser @period={{period}} @action={{action "changePeriod"}} @content={{availablePeriods}} @fullDay={{false}} />
+        <PeriodChooser @period={{this.period}} @action={{action "changePeriod"}} @content={{this.availablePeriods}} @fullDay={{false}} />
       </div>
 
       <div class="section-body">
-        <AdminReport @filters={{filters}} @showHeader={{false}} @dataSourceName="moderators_activity" />
+        <AdminReport @filters={{this.filters}} @showHeader={{false}} @dataSourceName="moderators_activity" />
       </div>
     </div>
   {{/if}}
 
   <div class="main-section">
-    <AdminReport @dataSourceName="flags_status" @reportOptions={{flagsStatusOptions}} @filters={{lastWeekfilters}} />
+    <AdminReport @dataSourceName="flags_status" @reportOptions={{this.flagsStatusOptions}} @filters={{this.lastWeekfilters}} />
 
-    <AdminReport @dataSourceName="post_edits" @filters={{lastWeekfilters}} />
+    <AdminReport @dataSourceName="post_edits" @filters={{this.lastWeekfilters}} />
 
-    <AdminReport @dataSourceName="user_flagging_ratio" @filters={{lastWeekfilters}} @reportOptions={{userFlaggingRatioOptions}} />
+    <AdminReport @dataSourceName="user_flagging_ratio" @filters={{this.lastWeekfilters}} @reportOptions={{this.userFlaggingRatioOptions}} />
 
     <PluginOutlet @name="admin-dashboard-moderation-bottom" @tagName="span" @connectorTagName="div" />
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs
index 2a45f8928d5..aac0b4d145e 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_reports.hbs
@@ -1,4 +1,4 @@
-<ConditionalLoadingSpinner @condition={{isLoading}}>
+<ConditionalLoadingSpinner @condition={{this.isLoading}}>
   <div class="reports-index section">
     <div class="section-title">
       <h2>{{i18n "admin.reports.title"}}</h2>
@@ -6,7 +6,7 @@
     </div>
 
     <ul class="reports-list">
-      {{#each filterReports as |report|}}
+      {{#each this.filterReports as |report|}}
         <li class="report">
           <LinkTo @route="adminReports.show" @model={{report.type}}>
             <h3 class="report-title">{{report.title}}</h3>
diff --git a/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs b/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
index b076f9f9f2c..247ca71f6df 100644
--- a/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
+++ b/app/assets/javascripts/admin/addon/templates/dashboard_security.hbs
@@ -2,9 +2,9 @@
   <PluginOutlet @name="admin-dashboard-security-top" @tagName="span" @connectorTagName="div" />
 
   <div class="main-section">
-    <AdminReport @dataSourceName="suspicious_logins" @filters={{lastWeekfilters}} />
+    <AdminReport @dataSourceName="suspicious_logins" @filters={{this.lastWeekfilters}} />
 
-    <AdminReport @dataSourceName="staff_logins" @filters={{lastWeekfilters}} />
+    <AdminReport @dataSourceName="staff_logins" @filters={{this.lastWeekfilters}} />
 
     <PluginOutlet @name="admin-dashboard-security-bottom" @tagName="span" @connectorTagName="div" />
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs b/app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs
index 03a32956681..0acb7d9d4f8 100644
--- a/app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-advanced-test.hbs
@@ -2,21 +2,20 @@
 
 <div class="email-advanced-test">
   <label for="email">{{i18n "admin.email.advanced_test.email"}}</label>
-  <Textarea @name="email" @value={{email}} class="email-body" />
-  <DButton @action={{action "run"}} @label="admin.email.advanced_test.run" />
+  <Textarea @name="email" @value={{this.email}} class="email-body" />  <DButton @action={{action "run"}} @label="admin.email.advanced_test.run" />
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if format}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.format}}
     <hr>
     <div class="text">
       <h3>{{i18n "admin.email.advanced_test.text"}}</h3>
-      <pre class="full-reason">{{html-safe text}}</pre>
+      <pre class="full-reason">{{html-safe this.text}}</pre>
     </div>
     <hr>
     <div class="elided">
       <h3>{{i18n "admin.email.advanced_test.elided"}}</h3>
-      <pre class="full-reason">{{html-safe elided}}</pre>
+      <pre class="full-reason">{{html-safe this.elided}}</pre>
     </div>
   {{/if}}
 </ConditionalLoadingSpinner>
diff --git a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
index 85fa2d8bed5..cf6ceb81bc4 100644
--- a/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-bounced.hbs
@@ -11,12 +11,12 @@
     <tbody>
       <tr class="filters">
         <td>{{i18n "admin.email.logs.filters.title"}}</td>
-        <td><TextField @value={{filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
-        <td><TextField @value={{filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
-        <td colspan="2"><TextField @value={{filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
+        <td><TextField @value={{this.filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
+        <td><TextField @value={{this.filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
+        <td colspan="2"><TextField @value={{this.filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
       </tr>
 
-      {{#each model as |l|}}
+      {{#each this.model as |l|}}
         <tr>
           <td>{{format-date l.created_at}}</td>
           <td>
@@ -46,7 +46,7 @@
           </td>
         </tr>
       {{else}}
-        {{#unless loading}}
+        {{#unless this.loading}}
           <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
@@ -54,4 +54,4 @@
   </table>
 </LoadMore>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/admin/addon/templates/email-index.hbs b/app/assets/javascripts/admin/addon/templates/email-index.hbs
index d21414f0f59..09401dfbef1 100644
--- a/app/assets/javascripts/admin/addon/templates/email-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-index.hbs
@@ -2,10 +2,10 @@
   <tbody>
     <tr>
       <th>{{i18n "admin.email.delivery_method"}}</th>
-      <td>{{delivery_method}}</td>
+      <td>{{this.delivery_method}}</td>
     </tr>
 
-    {{#each model.settings as |s|}}
+    {{#each this.model.settings as |s|}}
       <tr>
         <th style="width: 25%">{{s.name}}</th>
         <td>{{s.value}}</td>
@@ -18,13 +18,13 @@
   <div class="admin-controls">
     <div class="controls">
       <div class="inline-form">
-        {{#if sendingEmail}}
+        {{#if this.sendingEmail}}
           {{i18n "admin.email.sending_test"}}
         {{else}}
-          <TextField @value={{testEmailAddress}} @placeholderKey="admin.email.test_email_address" />
-          <DButton @class="btn-primary" @action={{action "sendTestEmail"}} @disabled={{sendTestEmailDisabled}} @label="admin.email.send_test" @type="submit" />
-          {{#if sentTestEmailMessage}}
-            <span class="result-message">{{sentTestEmailMessage}}</span>
+          <TextField @value={{this.testEmailAddress}} @placeholderKey="admin.email.test_email_address" />
+          <DButton @class="btn-primary" @action={{action "sendTestEmail"}} @disabled={{this.sendTestEmailDisabled}} @label="admin.email.send_test" @type="submit" />
+          {{#if this.sentTestEmailMessage}}
+            <span class="result-message">{{this.sentTestEmailMessage}}</span>
           {{/if}}
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
index a051a7b3134..d2ee4cad4d9 100644
--- a/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-preview-digest.hbs
@@ -4,15 +4,15 @@
   <div class="controls">
     <div class="inline-form">
       <label for="last-seen">{{i18n "admin.email.last_seen_user"}}</label>
-      <DatePickerPast @value={{lastSeen}} @id="last-seen" />
+      <DatePickerPast @value={{this.lastSeen}} @id="last-seen" />
       <label>{{i18n "admin.email.user"}}:</label>
-      <EmailGroupUserChooser @value={{username}} @onChange={{action "updateUsername"}} @options={{hash
+      <EmailGroupUserChooser @value={{this.username}} @onChange={{action "updateUsername"}} @options={{hash
           maximum=1
         }} />
       <DButton @class="btn-primary digest-refresh-button" @action={{action "refresh"}} @label="admin.email.refresh" />
       <div class="toggle">
         <label>{{i18n "admin.email.format"}}</label>
-        {{#if showHtml}}
+        {{#if this.showHtml}}
           <span>{{i18n "admin.email.html"}}</span>
           |
           <a href {{action "toggleShowHtml"}}>
@@ -27,19 +27,19 @@
   </div>
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
+<ConditionalLoadingSpinner @condition={{this.loading}}>
 
   <div class="email-preview-digest">
-    {{#if showSendEmailForm}}
+    {{#if this.showSendEmailForm}}
       <div class="controls">
         <div class="inline-form">
-          {{#if sendingEmail}}
+          {{#if this.sendingEmail}}
             {{i18n "admin.email.sending_test"}}
           {{else}}
             <label>{{i18n "admin.email.send_digest_label"}}</label>
-            <TextField @value={{email}} @placeholderKey="admin.email.test_email_address" />
-            <DButton @class="btn-default" @action={{action "sendEmail"}} @disabled={{sendEmailDisabled}} @label="admin.email.send_digest" />
-            {{#if sentEmail}}
+            <TextField @value={{this.email}} @placeholderKey="admin.email.test_email_address" />
+            <DButton @class="btn-default" @action={{action "sendEmail"}} @disabled={{this.sendEmailDisabled}} @label="admin.email.send_digest" />
+            {{#if this.sentEmail}}
               <span class="result-message">{{i18n "admin.email.sent_test"}}</span>
             {{/if}}
           {{/if}}
@@ -48,14 +48,14 @@
     {{/if}}
 
     <div class="preview-output">
-      {{#if showHtml}}
-        {{#if htmlEmpty}}
+      {{#if this.showHtml}}
+        {{#if this.htmlEmpty}}
           <p>{{i18n "admin.email.no_result"}}</p>
         {{else}}
-          <iframe title={{i18n "admin.email.html_preview"}} srcdoc={{model.html_content}} />
+          <iframe title={{i18n "admin.email.html_preview"}} srcdoc={{this.model.html_content}} />
         {{/if}}
       {{else}}
-        <pre>{{html-safe model.text_content}}</pre>
+        <pre>{{html-safe this.model.text_content}}</pre>
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/email-received.hbs b/app/assets/javascripts/admin/addon/templates/email-received.hbs
index 584872acf52..b503a8be513 100644
--- a/app/assets/javascripts/admin/addon/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-received.hbs
@@ -12,12 +12,12 @@
     <tbody>
       <tr class="filters">
         <td>{{i18n "admin.email.logs.filters.title"}}</td>
-        <td><TextField @value={{filter.from}} @placeholderKey="admin.email.incoming_emails.filters.from_placeholder" /></td>
-        <td><TextField @value={{filter.to}} @placeholderKey="admin.email.incoming_emails.filters.to_placeholder" /></td>
-        <td><TextField @value={{filter.subject}} @placeholderKey="admin.email.incoming_emails.filters.subject_placeholder" /></td>
+        <td><TextField @value={{this.filter.from}} @placeholderKey="admin.email.incoming_emails.filters.from_placeholder" /></td>
+        <td><TextField @value={{this.filter.to}} @placeholderKey="admin.email.incoming_emails.filters.to_placeholder" /></td>
+        <td><TextField @value={{this.filter.subject}} @placeholderKey="admin.email.incoming_emails.filters.subject_placeholder" /></td>
       </tr>
 
-      {{#each model as |email|}}
+      {{#each this.model as |email|}}
         <tr>
           <td class="time">{{format-date email.created_at}}</td>
           <td class="username">
@@ -55,4 +55,4 @@
   </table>
 </LoadMore>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
index 6a734246eb3..21dcbba21da 100644
--- a/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-rejected.hbs
@@ -13,13 +13,13 @@
     <tbody>
       <tr class="filters">
         <td>{{i18n "admin.email.logs.filters.title"}}</td>
-        <td><TextField @value={{filter.from}} @placeholderKey="admin.email.incoming_emails.filters.from_placeholder" /></td>
-        <td><TextField @value={{filter.to}} @placeholderKey="admin.email.incoming_emails.filters.to_placeholder" /></td>
-        <td><TextField @value={{filter.subject}} @placeholderKey="admin.email.incoming_emails.filters.subject_placeholder" /></td>
-        <td colspan="2"><TextField @value={{filter.error}} @placeholderKey="admin.email.incoming_emails.filters.error_placeholder" /></td>
+        <td><TextField @value={{this.filter.from}} @placeholderKey="admin.email.incoming_emails.filters.from_placeholder" /></td>
+        <td><TextField @value={{this.filter.to}} @placeholderKey="admin.email.incoming_emails.filters.to_placeholder" /></td>
+        <td><TextField @value={{this.filter.subject}} @placeholderKey="admin.email.incoming_emails.filters.subject_placeholder" /></td>
+        <td colspan="2"><TextField @value={{this.filter.error}} @placeholderKey="admin.email.incoming_emails.filters.error_placeholder" /></td>
       </tr>
 
-      {{#each model as |email|}}
+      {{#each this.model as |email|}}
         <tr>
           <td class="time">{{format-date email.created_at}}</td>
           <td class="username">
@@ -63,4 +63,4 @@
   </table>
 </LoadMore>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/admin/addon/templates/email-sent.hbs b/app/assets/javascripts/admin/addon/templates/email-sent.hbs
index 2317185cf65..ba28a0219e4 100644
--- a/app/assets/javascripts/admin/addon/templates/email-sent.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-sent.hbs
@@ -12,13 +12,13 @@
     <tbody>
       <tr class="filters">
         <td>{{i18n "admin.email.logs.filters.title"}}</td>
-        <td><TextField @value={{filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
-        <td><TextField @value={{filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
-        <td><TextField @value={{filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
-        <td><TextField @value={{filter.reply_key}} @placeholderKey="admin.email.logs.filters.reply_key_placeholder" /></td>
+        <td><TextField @value={{this.filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
+        <td><TextField @value={{this.filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
+        <td><TextField @value={{this.filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
+        <td><TextField @value={{this.filter.reply_key}} @placeholderKey="admin.email.logs.filters.reply_key_placeholder" /></td>
       </tr>
 
-      {{#each model as |l|}}
+      {{#each this.model as |l|}}
         <tr class="sent-email-item">
           <td class="sent-email-date">{{format-date l.created_at}}</td>
           <td class="sent-email-username">
@@ -44,7 +44,7 @@
           </td>
         </tr>
       {{else}}
-        {{#unless loading}}
+        {{#unless this.loading}}
           <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
@@ -52,4 +52,4 @@
   </table>
 </LoadMore>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/admin/addon/templates/email-skipped.hbs b/app/assets/javascripts/admin/addon/templates/email-skipped.hbs
index 5bd3479d504..bdeb2ec43d7 100644
--- a/app/assets/javascripts/admin/addon/templates/email-skipped.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-skipped.hbs
@@ -12,13 +12,13 @@
     <tbody>
       <tr class="filters">
         <td>{{i18n "admin.email.logs.filters.title"}}</td>
-        <td><TextField @value={{filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
-        <td><TextField @value={{filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
-        <td><TextField @value={{filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
+        <td><TextField @value={{this.filter.user}} @placeholderKey="admin.email.logs.filters.user_placeholder" /></td>
+        <td><TextField @value={{this.filter.address}} @placeholderKey="admin.email.logs.filters.address_placeholder" /></td>
+        <td><TextField @value={{this.filter.type}} @placeholderKey="admin.email.logs.filters.type_placeholder" /></td>
         <td></td>
       </tr>
 
-      {{#each model as |l|}}
+      {{#each this.model as |l|}}
         <tr>
           <td>{{format-date l.created_at}}</td>
           <td>
@@ -40,7 +40,7 @@
           </td>
         </tr>
       {{else}}
-        {{#unless loading}}
+        {{#unless this.loading}}
           <tr><td colspan="5">{{i18n "admin.email.logs.none"}}</td></tr>
         {{/unless}}
       {{/each}}
@@ -48,4 +48,4 @@
   </table>
 </LoadMore>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
diff --git a/app/assets/javascripts/admin/addon/templates/embedding.hbs b/app/assets/javascripts/admin/addon/templates/embedding.hbs
index a09ea779b72..2ae5c749498 100644
--- a/app/assets/javascripts/admin/addon/templates/embedding.hbs
+++ b/app/assets/javascripts/admin/addon/templates/embedding.hbs
@@ -1,5 +1,5 @@
 <div class="embeddable-hosts">
-  {{#if embedding.embeddable_hosts}}
+  {{#if this.embedding.embeddable_hosts}}
     <table class="embedding grid">
       <thead>
         <th style="width: 25%">{{i18n "admin.embedding.host"}}</th>
@@ -9,7 +9,7 @@
         <th style="width: 10%">&nbsp;</th>
       </thead>
       <tbody>
-        {{#each embedding.embeddable_hosts as |host|}}
+        {{#each this.embedding.embeddable_hosts as |host|}}
           <EmbeddableHost @host={{host}} @deleteHost={{action "deleteHost"}} />
         {{/each}}
       </tbody>
@@ -21,10 +21,10 @@
   <DButton @label="admin.embedding.add_host" @action={{action "addHost"}} @icon="plus" @class="btn-primary add-host" />
 </div>
 
-{{#if showSecondary}}
+{{#if this.showSecondary}}
   <div class="embedding-secondary">
     <p>{{html-safe (i18n "admin.embedding.sample")}}</p>
-    <HighlightedCode @code={{embeddingCode}} @lang="html" />
+    <HighlightedCode @code={{this.embeddingCode}} @lang="html" />
   </div>
 
   <hr>
@@ -32,27 +32,27 @@
   <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.settings"}}</h3>
 
-    <EmbeddingSetting @field="embed_by_username" @value={{embedding.embed_by_username}} />
-    <EmbeddingSetting @field="embed_post_limit" @value={{embedding.embed_post_limit}} />
-    <EmbeddingSetting @field="embed_title_scrubber" @value={{embedding.embed_title_scrubber}} @placeholder="- site.com$" />
-    <EmbeddingSetting @field="embed_truncate" @value={{embedding.embed_truncate}} @type="checkbox" />
-    <EmbeddingSetting @field="embed_unlisted" @value={{embedding.embed_unlisted}} @type="checkbox" />
+    <EmbeddingSetting @field="embed_by_username" @value={{this.embedding.embed_by_username}} />
+    <EmbeddingSetting @field="embed_post_limit" @value={{this.embedding.embed_post_limit}} />
+    <EmbeddingSetting @field="embed_title_scrubber" @value={{this.embedding.embed_title_scrubber}} @placeholder="- site.com$" />
+    <EmbeddingSetting @field="embed_truncate" @value={{this.embedding.embed_truncate}} @type="checkbox" />
+    <EmbeddingSetting @field="embed_unlisted" @value={{this.embedding.embed_unlisted}} @type="checkbox" />
   </div>
 
   <div class="embedding-secondary">
     <h3>{{i18n "admin.embedding.crawling_settings"}}</h3>
     <p class="description">{{i18n "admin.embedding.crawling_description"}}</p>
 
-    <EmbeddingSetting @field="allowed_embed_selectors" @value={{embedding.allowed_embed_selectors}} @placeholder="article, #story, .post" />
+    <EmbeddingSetting @field="allowed_embed_selectors" @value={{this.embedding.allowed_embed_selectors}} @placeholder="article, #story, .post" />
 
-    <EmbeddingSetting @field="blocked_embed_selectors" @value={{embedding.blocked_embed_selectors}} @placeholder=".ad-unit, header" />
+    <EmbeddingSetting @field="blocked_embed_selectors" @value={{this.embedding.blocked_embed_selectors}} @placeholder=".ad-unit, header" />
 
-    <EmbeddingSetting @field="allowed_embed_classnames" @value={{embedding.allowed_embed_classnames}} @placeholder="emoji, classname" />
+    <EmbeddingSetting @field="allowed_embed_classnames" @value={{this.embedding.allowed_embed_classnames}} @placeholder="emoji, classname" />
   </div>
 
   <div class="embedding-secondary">
-    <DButton @label="admin.embedding.save" @action={{action "saveChanges"}} @class="btn-primary embed-save" @disabled={{embedding.isSaving}} />
+    <DButton @label="admin.embedding.save" @action={{action "saveChanges"}} @class="btn-primary embed-save" @disabled={{this.embedding.isSaving}} />
 
-    {{#if saved}}{{i18n "saved"}}{{/if}}
+    {{#if this.saved}}{{i18n "saved"}}{{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/emojis.hbs b/app/assets/javascripts/admin/addon/templates/emojis.hbs
index 18f33fbf654..788c1b913b2 100644
--- a/app/assets/javascripts/admin/addon/templates/emojis.hbs
+++ b/app/assets/javascripts/admin/addon/templates/emojis.hbs
@@ -3,23 +3,23 @@
 
   <p class="desc">{{i18n "admin.emoji.help"}}</p>
 
-  <EmojiUploader @emojiGroups={{emojiGroups}} @done={{action "emojiUploaded"}} @id="emoji-uploader" />
+  <EmojiUploader @emojiGroups={{this.emojiGroups}} @done={{action "emojiUploaded"}} @id="emoji-uploader" />
 
   <hr>
 
-  {{#if sortedEmojis}}
+  {{#if this.sortedEmojis}}
     <table id="custom_emoji">
       <thead>
         <tr>
           <th>{{i18n "admin.emoji.image"}}</th>
           <th>{{i18n "admin.emoji.name"}}</th>
           <th colspan="2">
-            <ComboBox @value={{filter}} @content={{sortingGroups}} @nameProperty={{null}} @valueProperty={{null}} @onChange={{action "filterGroups"}} />
+            <ComboBox @value={{this.filter}} @content={{this.sortingGroups}} @nameProperty={{null}} @valueProperty={{null}} @onChange={{action "filterGroups"}} />
           </th>
         </tr>
       </thead>
       <tbody>
-        {{#each sortedEmojis as |e|}}
+        {{#each this.sortedEmojis as |e|}}
           <tr>
             <td><img class="emoji emoji-custom" src={{e.url}} title={{e.name}} alt={{i18n "admin.emoji.alt"}}></td>
             <td>:{{e.name}}:</td>
diff --git a/app/assets/javascripts/admin/addon/templates/logs.hbs b/app/assets/javascripts/admin/addon/templates/logs.hbs
index 237f810fb8c..52b89c80398 100644
--- a/app/assets/javascripts/admin/addon/templates/logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs.hbs
@@ -4,7 +4,7 @@
   <NavItem @route="adminLogs.screenedIpAddresses" @label="admin.logs.screened_ips.title" />
   <NavItem @route="adminLogs.screenedUrls" @label="admin.logs.screened_urls.title" />
   <NavItem @route="adminSearchLogs" @label="admin.logs.search_logs.title" />
-  {{#if currentUser.admin}}
+  {{#if this.currentUser.admin}}
     <NavItem @path="/logs" @label="admin.logs.logster.title" />
   {{/if}}
 </AdminNav>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
index 57c78176eb0..8462ca9226d 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-emails.hbs
@@ -6,8 +6,8 @@
 
 <br>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if model.length}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.model.length}}
 
     <table class="screened-emails grid">
       <thead>
@@ -20,7 +20,7 @@
         <th class="action"></th>
       </thead>
       <tbody>
-        {{#each model as |item|}}
+        {{#each this.model as |item|}}
           <tr class="admin-list-item">
             <td class="col first email">
               <div class="overflow-ellipsis" title={{item.email}}>{{item.email}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
index 9b981b1af35..56af8c935f3 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-ip-addresses.hbs
@@ -2,15 +2,15 @@
 
 <div class="screened-ip-controls">
   <div class="filter-screened-ip-address inline-form">
-    <TextField @value={{filter}} @class="ip-address-input" @placeholderKey="admin.logs.screened_ips.form.filter" @autocorrect="off" @autocapitalize="off" />
+    <TextField @value={{this.filter}} @class="ip-address-input" @placeholderKey="admin.logs.screened_ips.form.filter" @autocorrect="off" @autocapitalize="off" />
     <DButton @class="btn-default" @action={{action "exportScreenedIpList"}} @icon="download" @title="admin.export_csv.button_title.screened_ip" @label="admin.export_csv.button_text" />
   </div>
 
   <ScreenedIpAddressForm @action={{action "recordAdded"}} />
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if model.length}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.model.length}}
     <table class="admin-logs-table screened-ip-addresses grid">
       <thead class="heading-container">
         <th class="col heading first ip_address">{{i18n "admin.logs.ip_address"}}</th>
@@ -21,7 +21,7 @@
         <th class="col heading actions"></th>
       </thead>
       <tbody>
-        {{#each model as |item|}}
+        {{#each this.model as |item|}}
           <tr class="admin-list-item">
             <td class="col first ip_address">
               {{#if item.editing}}
diff --git a/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs b/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
index 10f9fd3d653..55096d98ab1 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/screened-urls.hbs
@@ -4,8 +4,8 @@
   <DButton @class="btn-default" @action={{action "exportScreenedUrlList"}} @title="admin.export_csv.button_title.screened_url" @icon="download" @label="admin.export_csv.button_text" />
 <br>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if model.length}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.model.length}}
     <table class="screened-urls grid">
       <thead>
         <th class="first domain">{{i18n "admin.logs.screened_urls.domain"}}</th>
@@ -15,7 +15,7 @@
         <th class="created_at">{{i18n "admin.logs.created_at"}}</th>
       </thead>
       <tbody>
-        {{#each model as |url|}}
+        {{#each this.model as |url|}}
           <tr class="admin-list-item">
             <td class="col first domain">
               <div class="overflow-ellipsis" title={{url.domain}}>{{url.domain}}</div>
diff --git a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
index 0250ebd3888..bcee25b4396 100644
--- a/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
+++ b/app/assets/javascripts/admin/addon/templates/logs/staff-action-logs.hbs
@@ -1,37 +1,37 @@
 <div class="staff-action-logs-controls">
-  {{#if filtersExists}}
+  {{#if this.filtersExists}}
     <div class="staff-action-logs-filters">
       <a href {{action "clearAllFilters"}} class="clear-filters filter btn">
         <span class="label">{{i18n "admin.logs.staff_actions.clear_filters"}}</span>
       </a>
-      {{#if actionFilter}}
+      {{#if this.actionFilter}}
         <a href {{action "clearFilter" "actionFilter"}} class="filter btn">
-          <span class="label">{{i18n "admin.logs.action"}}</span>: {{actionFilter}}
+          <span class="label">{{i18n "admin.logs.action"}}</span>: {{this.actionFilter}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
-      {{#if filters.acting_user}}
+      {{#if this.filters.acting_user}}
         <a href {{action "clearFilter" "acting_user"}} class="filter btn">
-          <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{filters.acting_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.staff_user"}}</span>: {{this.filters.acting_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
-      {{#if filters.target_user}}
+      {{#if this.filters.target_user}}
         <a href {{action "clearFilter" "target_user"}} class="filter btn">
-          <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{filters.target_user}}
+          <span class="label">{{i18n "admin.logs.staff_actions.target_user"}}</span>: {{this.filters.target_user}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
-      {{#if filters.subject}}
+      {{#if this.filters.subject}}
         <a href {{action "clearFilter" "subject"}} class="filter btn">
-          <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{filters.subject}}
+          <span class="label">{{i18n "admin.logs.staff_actions.subject"}}</span>: {{this.filters.subject}}
           {{d-icon "times-circle"}}
         </a>
       {{/if}}
     </div>
   {{else}}
     {{i18n "admin.logs.staff_actions.filter"}}
-    <ComboBox @content={{userHistoryActions}} @value={{filterActionId}} @onChange={{action "filterActionIdChanged"}} @options={{hash
+    <ComboBox @content={{this.userHistoryActions}} @value={{this.filterActionId}} @onChange={{action "filterActionIdChanged"}} @options={{hash
         none="admin.logs.staff_actions.all"
       }} />
   {{/if}}
@@ -43,7 +43,7 @@
 
 <StaffActions>
   <LoadMore @selector=".staff-logs tr" @action={{action "loadMore"}}>
-    {{#if model.content}}
+    {{#if this.model.content}}
       <table class="table staff-logs grid">
         <thead>
           <th>{{i18n "admin.logs.staff_actions.staff_user"}}</th>
@@ -54,7 +54,7 @@
           <th>{{i18n "admin.logs.staff_actions.context"}}</th>
         </thead>
         <tbody>
-          {{#each model.content as |item|}}
+          {{#each this.model.content as |item|}}
             <tr class="admin-list-item">
               <td class="staff-users">
                 <div class="staff-user">
@@ -101,8 +101,8 @@
           {{/each}}
         </tbody>
       </table>
-    {{else if model.loadingMore}}
-      <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+    {{else if this.model.loadingMore}}
+      <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
     {{else}}
       {{i18n "search.no_results"}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs
index e2348526e1e..64a401e7a08 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-add-upload.hbs
@@ -6,17 +6,17 @@
     </section>
     <section class="field">
       <label for="theme-variable-name">{{i18n "admin.customize.theme.variable_name"}}</label>
-      <Input @id="theme-variable-name" @value={{name}} />
+      <Input @id="theme-variable-name" @value={{this.name}} />
     </section>
-    {{#if fileSelected}}
-      {{#if errorMessage}}
-        <span class="alert alert-error">{{errorMessage}}</span>
+    {{#if this.fileSelected}}
+      {{#if this.errorMessage}}
+        <span class="alert alert-error">{{this.errorMessage}}</span>
       {{/if}}
     {{/if}}
   </div>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "upload"}} @disabled={{disabled}} @class="btn btn-primary" @icon="upload" @label="admin.customize.theme.upload" />
+  <DButton @action={{action "upload"}} @disabled={{this.disabled}} @class="btn btn-primary" @icon="upload" @label="admin.customize.theme.upload" />
   <DModalCancel @close={{route-action "closeModal"}} />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs
index df8e196d946..8f0c4a2eb57 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-api-key-urls.hbs
@@ -1,7 +1,7 @@
 <DModalBody @title="admin.api.scopes.allowed_urls">
   <div>
     <ul>
-      {{#each model.urls as |url|}}
+      {{#each this.model.urls as |url|}}
         <li>
           <code>{{url}}</code>
         </li>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs
index ef68ae0d4ce..3fedbcac6c1 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-badge-preview.hbs
@@ -1,8 +1,8 @@
 <DModalBody @title="admin.badges.preview.modal_title" @class="badge-query-preview">
-  {{#if errors}}
+  {{#if this.errors}}
     <p class="error-header">{{i18n "admin.badges.preview.sql_error_header"}}</p>
 
-    <pre class="badge-errors">{{errors}}</pre>
+    <pre class="badge-errors">{{this.errors}}</pre>
 
     {{!--
       TODO we want some help pages for this, link to those instead
@@ -16,14 +16,14 @@
 
   {{else}}
     <p class="grant-count">
-      {{#if count}}
-        {{html-safe (i18n "admin.badges.preview.grant_count" count=count)}}
+      {{#if this.count}}
+        {{html-safe (i18n "admin.badges.preview.grant_count" count=this.count)}}
       {{else}}
         {{html-safe (i18n "admin.badges.preview.no_grant_count")}}
       {{/if}}
     </p>
 
-    {{#if countWarning}}
+    {{#if this.countWarning}}
       <div class="count-warning">
         <p class="heading">
           {{d-icon "exclamation-triangle"}}
@@ -35,20 +35,20 @@
       </div>
     {{/if}}
 
-    {{#if sample}}
+    {{#if this.sample}}
       <p class="sample">
         {{i18n "admin.badges.preview.sample"}}
       </p>
       <ul>
-        {{#each processedSample as |html|}}
+        {{#each this.processedSample as |html|}}
           <li>{{html-safe html}}</li>
         {{/each}}
       </ul>
     {{/if}}
 
-    {{#if hasQueryPlan}}
+    {{#if this.hasQueryPlan}}
       <div class="badge-query-plan">
-        {{html-safe queryPlanHtml}}
+        {{html-safe this.queryPlanHtml}}
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs
index 3d5980e00e7..f3fd868e251 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-color-scheme-select-base.hbs
@@ -1,7 +1,7 @@
 <div>
   <DModalBody @title="admin.customize.colors.select_base.title">
     {{i18n "admin.customize.colors.select_base.description"}}
-    <ComboBox @content={{model}} @value={{selectedBaseThemeId}} @onChange={{action (mut selectedBaseThemeId)}} @valueProperty="base_scheme_id" />
+    <ComboBox @content={{this.model}} @value={{this.selectedBaseThemeId}} @onChange={{action (mut this.selectedBaseThemeId)}} @valueProperty="base_scheme_id" />
   </DModalBody>
 
   <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs
index b9836ac0025..9a0665f762f 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-posts-confirmation.hbs
@@ -1,11 +1,11 @@
 <div>
-  <DModalBody @rawTitle={{i18n "admin.user.delete_posts.confirmation.title" username=username}}>
-    <p>{{html-safe (i18n "admin.user.delete_posts.confirmation.description" username=username post_count=postCount text=text)}}</p>
-    <Input @type="text" @value={{value}} />
+  <DModalBody @rawTitle={{i18n "admin.user.delete_posts.confirmation.title" username=this.username}}>
+    <p>{{html-safe (i18n "admin.user.delete_posts.confirmation.description" username=this.username post_count=this.postCount text=this.text)}}</p>
+    <Input @type="text" @value={{this.value}} />
   </DModalBody>
 
   <div class="modal-footer">
-    <DButton @class="btn-danger" @action={{action "confirm"}} @icon="trash-alt" @disabled={{deleteDisabled}} @translatedLabel={{deleteButtonText}} />
+    <DButton @class="btn-danger" @action={{action "confirm"}} @icon="trash-alt" @disabled={{this.deleteDisabled}} @translatedLabel={{this.deleteButtonText}} />
     <DButton @action={{action "close"}} @label="admin.user.delete_posts.confirmation.cancel" />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs
index 8f86288d70c..8989e8d57ea 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-delete-user-posts-progress.hbs
@@ -1,4 +1,4 @@
 <DModalBody @title="admin.user.delete_posts.progress.title" @dismissable={{false}}>
   <p>{{I18n "admin.user.delete_posts.progress.description"}}</p>
-  <div class="progress-bar"><span style={{html-safe (concat "width: " deletedPercentage "%")}}></span></div>
+  <div class="progress-bar"><span style={{html-safe (concat "width: " this.deletedPercentage "%")}}></span></div>
 </DModalBody>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs
index 7c47c27779b..e36148e37ca 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-edit-badge-groupings.hbs
@@ -1,7 +1,7 @@
 <DModalBody @title="admin.badges.badge_groupings.modal_title" @class="badge-groupings-modal">
   <div class="badge-groupings">
     <ul class="badge-groupings-list">
-      {{#each workingCopy as |wc|}}
+      {{#each this.workingCopy as |wc|}}
         <li class="badge-grouping-item">
           <div class="badge-grouping">
             {{#if wc.editing}}
@@ -25,6 +25,6 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "saveAll"}} @label="admin.badges.save" @class="btn-primary" @disabled={{submitDisabled}} />
+  <DButton @action={{action "saveAll"}} @label="admin.badges.save" @class="btn-primary" @disabled={{this.submitDisabled}} />
   <DModalCancel @close={{route-action "closeModal"}} />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs
index 057f58c1ed8..b5d2abae644 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-incoming-email.hbs
@@ -2,9 +2,9 @@
   <div class="control-group">
     <label>{{i18n "admin.email.incoming_emails.modal.error"}}</label>
     <div class="controls">
-      <p>{{model.error}}</p>
-      {{#if model.error_description}}
-        <p class="error-description">{{model.error_description}}</p>
+      <p>{{this.model.error}}</p>
+      {{#if this.model.error_description}}
+        <p class="error-description">{{this.model.error_description}}</p>
       {{/if}}
     </div>
   </div>
@@ -14,31 +14,31 @@
   <div class="control-group">
     <label>{{i18n "admin.email.incoming_emails.modal.headers"}}</label>
     <div class="controls">
-      <Textarea @value={{model.headers}} @wrap="off" />
+      <Textarea @value={{this.model.headers}} @wrap="off" />
     </div>
   </div>
 
   <div class="control-group">
     <label>{{i18n "admin.email.incoming_emails.modal.subject"}}</label>
     <div class="controls">
-      {{model.subject}}
+      {{this.model.subject}}
     </div>
   </div>
 
   <div class="control-group">
     <label>{{i18n "admin.email.incoming_emails.modal.body"}}</label>
     <div class="controls">
-      <Textarea @value={{model.body}} />
+      <Textarea @value={{this.model.body}} />
     </div>
   </div>
 
-  {{#if model.rejection_message}}
+  {{#if this.model.rejection_message}}
     <hr>
 
     <div class="control-group">
       <label>{{i18n "admin.email.incoming_emails.modal.rejection_message"}}</label>
       <div class="controls">
-        <Textarea @value={{model.rejection_message}} />
+        <Textarea @value={{this.model.rejection_message}} />
       </div>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
index abb8dde504e..c732a486fa4 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-install-theme.hbs
@@ -1,16 +1,16 @@
 <DModalBody @class="install-theme" @title="admin.customize.theme.install">
-  {{#unless directRepoInstall}}
+  {{#unless this.directRepoInstall}}
     <div class="install-theme-items">
-      <InstallThemeItem @value="popular" @selection={{selection}} @label="admin.customize.theme.install_popular" />
-      <InstallThemeItem @value="local" @selection={{selection}} @label="admin.customize.theme.install_upload" />
-      <InstallThemeItem @value="remote" @selection={{selection}} @label="admin.customize.theme.install_git_repo" />
-      <InstallThemeItem @value="create" @selection={{selection}} @label="admin.customize.theme.install_create" @showIcon={{true}} />
+      <InstallThemeItem @value="popular" @selection={{this.selection}} @label="admin.customize.theme.install_popular" />
+      <InstallThemeItem @value="local" @selection={{this.selection}} @label="admin.customize.theme.install_upload" />
+      <InstallThemeItem @value="remote" @selection={{this.selection}} @label="admin.customize.theme.install_git_repo" />
+      <InstallThemeItem @value="create" @selection={{this.selection}} @label="admin.customize.theme.install_create" @showIcon={{true}} />
     </div>
   {{/unless}}
   <div class="install-theme-content">
-    {{#if popular}}
+    {{#if this.popular}}
       <div class="popular-theme-items">
-        {{#each themes as |theme|}}
+        {{#each this.themes as |theme|}}
           <div class="popular-theme-item" data-name={{theme.name}}>
             <div class="popular-theme-name">
               <a href={{theme.meta_url}} rel="noopener noreferrer" target="_blank">
@@ -28,7 +28,7 @@
               {{#if theme.installed}}
                 <span>{{i18n "admin.customize.theme.installed"}}</span>
               {{else}}
-                <DButton @class="btn-small" @label="admin.customize.theme.install" @disabled={{installDisabled}} @icon="upload" @action={{action "installThemeFromList" theme.value}} />
+                <DButton @class="btn-small" @label="admin.customize.theme.install" @disabled={{this.installDisabled}} @icon="upload" @action={{action "installThemeFromList" theme.value}} />
 
                 {{#if theme.preview}}
                   <a href={{theme.preview}} rel="noopener noreferrer" target="_blank">{{d-icon "desktop"}} {{i18n "admin.customize.theme.preview"}}</a>
@@ -40,44 +40,43 @@
       </div>
     {{/if}}
 
-    {{#if local}}
+    {{#if this.local}}
       <div class="inputs">
         <input onchange={{action "uploadLocaleFile"}} type="file" id="file-input" accept=".dcstyle.json,application/json,.tar.gz,application/x-gzip,.zip,application/zip"><br>
         <span class="description">{{i18n "admin.customize.theme.import_file_tip"}}</span>
       </div>
     {{/if}}
 
-    {{#if remote}}
+    {{#if this.remote}}
       <div class="inputs">
         <div class="repo">
           <div class="label">{{i18n "admin.customize.theme.import_web_tip"}}</div>
-          <Input @value={{uploadUrl}} placeholder={{urlPlaceholder}} />
+          <Input @value={{this.uploadUrl}} placeholder={{this.urlPlaceholder}} />
         </div>
 
         <DButton @class="btn-small advanced-repo" @action={{action "toggleAdvanced"}} @label="admin.customize.theme.import_web_advanced" />
 
-        {{#if advancedVisible}}
+        {{#if this.advancedVisible}}
           <div class="branch">
             <div class="label">{{i18n "admin.customize.theme.remote_branch"}}</div>
-            <Input @value={{branch}} placeholder="main" />
+            <Input @value={{this.branch}} placeholder="main" />
           </div>
 
           <div class="check-private">
             <label>
-              <Input @type="checkbox" @checked={{privateChecked}} />
+              <Input @type="checkbox" @checked={{this.privateChecked}} />
               {{i18n "admin.customize.theme.is_private"}}
             </label>
           </div>
-          {{#if showPublicKey}}
+          {{#if this.showPublicKey}}
             <div class="public-key">
               <div class="label">{{i18n "admin.customize.theme.public_key"}}</div>
               <div class="public-key-text-wrapper">
-                <Textarea class="public-key-value" @readonly={{true}} @value={{publicKey}} />
-                <CopyButton @selector="textarea.public-key-value" />
+                <Textarea class="public-key-value" @readonly={{true}} @value={{this.publicKey}} />                <CopyButton @selector="textarea.public-key-value" />
               </div>
             </div>
           {{else}}
-            {{#if privateChecked}}
+            {{#if this.privateChecked}}
               <div class="public-key-note">{{i18n "admin.customize.theme.public_key_note"}}</div>
             {{/if}}
           {{/if}}
@@ -85,34 +84,34 @@
       </div>
     {{/if}}
 
-    {{#if create}}
+    {{#if this.create}}
       <div class="inputs">
         <div class="label">{{i18n "admin.customize.theme.create_name"}}</div>
-        <Input @value={{name}} placeholder={{placeholder}} />
+        <Input @value={{this.name}} placeholder={{this.placeholder}} />
 
         <div class="label">{{i18n "admin.customize.theme.create_type"}}</div>
-        <ComboBox @valueProperty="value" @content={{createTypes}} @value={{selectedType}} @onChange={{action (mut selectedType)}} />
+        <ComboBox @valueProperty="value" @content={{this.createTypes}} @value={{this.selectedType}} @onChange={{action (mut this.selectedType)}} />
       </div>
     {{/if}}
 
-    {{#if directRepoInstall}}
+    {{#if this.directRepoInstall}}
       <div class="repo">
-        <div class="label">{{html-safe (i18n "admin.customize.theme.direct_install_tip" name=uploadName)}}</div>
-        <pre><code>{{uploadUrl}}</code></pre>
+        <div class="label">{{html-safe (i18n "admin.customize.theme.direct_install_tip" name=this.uploadName)}}</div>
+        <pre><code>{{this.uploadUrl}}</code></pre>
       </div>
     {{/if}}
   </div>
 
 </DModalBody>
 
-{{#unless popular}}
+{{#unless this.popular}}
   <div class="modal-footer">
-    {{#if duplicateRemoteThemeWarning}}
+    {{#if this.duplicateRemoteThemeWarning}}
       <div class="install-theme-warning">
-        ⚠️ {{duplicateRemoteThemeWarning}}
+        ⚠️ {{this.duplicateRemoteThemeWarning}}
       </div>
     {{/if}}
-    <DButton @action={{action "installTheme"}} @disabled={{installDisabled}} @class="btn btn-primary" @label={{submitLabel}} />
+    <DButton @action={{action "installTheme"}} @disabled={{this.installDisabled}} @class="btn btn-primary" @label={{this.submitLabel}} />
     <DModalCancel @close={{route-action "closeModal"}} />
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
index d315ac0672b..431cd7cd1b6 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-confirmation.hbs
@@ -1,11 +1,11 @@
 <div>
-  <DModalBody @rawTitle={{i18n "admin.user.merge.confirmation.title" username=username}}>
-    <p>{{html-safe (i18n "admin.user.merge.confirmation.description" username=username targetUsername=targetUsername text=text)}}</p>
-    <Input @type="text" @value={{value}} />
+  <DModalBody @rawTitle={{i18n "admin.user.merge.confirmation.title" username=this.username}}>
+    <p>{{html-safe (i18n "admin.user.merge.confirmation.description" username=this.username targetUsername=this.targetUsername text=this.text)}}</p>
+    <Input @type="text" @value={{this.value}} />
   </DModalBody>
 
   <div class="modal-footer">
-    <DButton @class="btn-danger" @action={{action "confirm"}} @icon="trash-alt" @disabled={{mergeDisabled}} @translatedLabel={{mergeButtonText}} />
+    <DButton @class="btn-danger" @action={{action "confirm"}} @icon="trash-alt" @disabled={{this.mergeDisabled}} @translatedLabel={{this.mergeButtonText}} />
     <DButton @action={{action "close"}} @label="admin.user.merge.confirmation.cancel" />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs
index 2f08cd30a52..3914e97cb47 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-progress.hbs
@@ -1,3 +1,3 @@
 <DModalBody @title="admin.user.merge.progress.title" @dismissable={{false}}>
-  {{ message }}
+  {{ this.message }}
 </DModalBody>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
index b8b1f604391..c0fccf08b6b 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-merge-users-prompt.hbs
@@ -1,14 +1,14 @@
 <div>
-  <DModalBody @rawTitle={{i18n "admin.user.merge.prompt.title" username=username}}>
-    <p>{{html-safe (i18n "admin.user.merge.prompt.description" username=username)}}</p>
-    <EmailGroupUserChooser @value={{targetUsername}} @onChange={{action "updateUsername"}} @options={{hash
+  <DModalBody @rawTitle={{i18n "admin.user.merge.prompt.title" username=this.username}}>
+    <p>{{html-safe (i18n "admin.user.merge.prompt.description" username=this.username)}}</p>
+    <EmailGroupUserChooser @value={{this.targetUsername}} @onChange={{action "updateUsername"}} @options={{hash
         maximum=1
         filterPlaceholder="admin.user.merge.prompt.target_username_placeholder"
       }} />
   </DModalBody>
 
   <div class="modal-footer">
-    <DButton @class="btn-primary" @action={{action "showConfirmation"}} @icon="trash-alt" @disabled={{mergeDisabled}} @translatedLabel={{mergeButtonText}} />
+    <DButton @class="btn-primary" @action={{action "showConfirmation"}} @icon="trash-alt" @disabled={{this.mergeDisabled}} @translatedLabel={{this.mergeButtonText}} />
     <DButton @action={{action "close"}} @label="admin.user.merge.prompt.cancel" />
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs
index f56a14d706f..d6219f480c5 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-reseed.hbs
@@ -1,10 +1,10 @@
 <DModalBody @title="admin.reseed.modal.title" @subtitle="admin.reseed.modal.subtitle" @class="reseed-modal">
-  <ConditionalLoadingSpinner @condition={{loading}}>
-    {{#if categories}}
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
+    {{#if this.categories}}
       <fieldset>
         <legend class="options-group-title">{{i18n "admin.reseed.modal.categories"}}</legend>
 
-        {{#each categories as |category|}}
+        {{#each this.categories as |category|}}
           <label>
             <Input class="option" @type="checkbox" @checked={{category.selected}} />
             <span>{{category.name}}</span>
@@ -15,11 +15,11 @@
 
     <br>
 
-    {{#if topics}}
+    {{#if this.topics}}
       <fieldset>
         <legend class="options-group-title">{{i18n "admin.reseed.modal.topics"}}</legend>
 
-        {{#each topics as |topic|}}
+        {{#each this.topics as |topic|}}
           <label>
             <Input class="option" @type="checkbox" @checked={{topic.selected}} />
             <span>{{topic.name}}</span>
@@ -31,10 +31,10 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <ConditionalLoadingSpinner @condition={{reseeding}} @size="small" />
-  <DButton @action={{action "reseed"}} @class="btn-danger" @label="admin.reseed.modal.replace" @disabled={{reseeding}} />
+  <ConditionalLoadingSpinner @condition={{this.reseeding}} @size="small" />
+  <DButton @action={{action "reseed"}} @class="btn-danger" @label="admin.reseed.modal.replace" @disabled={{this.reseeding}} />
 
-  {{#unless reseeding}}
+  {{#unless this.reseeding}}
     <DModalCancel @close={{route-action "closeModal"}} />
   {{/unless}}
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs
index 2dec18de884..08f3e0a909b 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-silence-user.hbs
@@ -1,21 +1,21 @@
 <DModalBody @title="admin.user.silence_modal_title">
-  <ConditionalLoadingSpinner @condition={{loadingUser}}>
+  <ConditionalLoadingSpinner @condition={{this.loadingUser}}>
 
-    {{#if errorMessage}}
-      <div class="alert alert-error">{{errorMessage}}</div>
+    {{#if this.errorMessage}}
+      <div class="alert alert-error">{{this.errorMessage}}</div>
     {{/if}}
 
-    <AdminPenaltyHistory @user={{user}} />
+    <AdminPenaltyHistory @user={{this.user}} />
 
     <div class="until-controls">
       <label>
-        <FutureDateInput @class="silence-until" @label="admin.user.silence_duration" @clearable={{false}} @input={{silenceUntil}} @onChangeInput={{action (mut silenceUntil)}} />
+        <FutureDateInput @class="silence-until" @label="admin.user.silence_duration" @clearable={{false}} @input={{this.silenceUntil}} @onChangeInput={{action (mut this.silenceUntil)}} />
       </label>
     </div>
 
-    <SilenceDetails @reason={{reason}} @message={{message}} />
-    {{#if postId}}
-      <PenaltyPostAction @postId={{postId}} @postAction={{postAction}} @postEdit={{postEdit}} />
+    <SilenceDetails @reason={{this.reason}} @message={{this.message}} />
+    {{#if this.postId}}
+      <PenaltyPostAction @postId={{this.postId}} @postAction={{this.postAction}} @postEdit={{this.postEdit}} />
     {{/if}}
 
   </ConditionalLoadingSpinner>
@@ -23,7 +23,7 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-danger perform-silence" @action={{action "silence"}} @disabled={{submitDisabled}} @icon="microphone-slash" @label="admin.user.silence" />
+  <DButton @class="btn-danger perform-silence" @action={{action "silence"}} @disabled={{this.submitDisabled}} @icon="microphone-slash" @label="admin.user.silence" />
   <DModalCancel @close={{route-action "closeModal"}} />
-  <ConditionalLoadingSpinner @condition={{loading}} @size="small" />
+  <ConditionalLoadingSpinner @condition={{this.loading}} @size="small" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs
index e23e737cc1f..5ab158631dd 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-staff-action-log-details.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="admin.logs.staff_actions.modal_title">
-  <pre>{{model.details}}</pre>
+  <pre>{{this.model.details}}</pre>
 </DModalBody>
 <div class="modal-footer">
   <DButton @action={{route-action "closeModal"}} @label="close" />
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs
index 4c3288338dc..71daba820cd 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-suspend-user.hbs
@@ -1,22 +1,22 @@
 <DModalBody @title="admin.user.suspend_modal_title">
-  <ConditionalLoadingSpinner @condition={{loadingUser}}>
+  <ConditionalLoadingSpinner @condition={{this.loadingUser}}>
 
-    {{#if errorMessage}}
-      <div class="alert alert-error">{{errorMessage}}</div>
+    {{#if this.errorMessage}}
+      <div class="alert alert-error">{{this.errorMessage}}</div>
     {{/if}}
 
-    {{#if user.canSuspend}}
-      <AdminPenaltyHistory @user={{user}} />
+    {{#if this.user.canSuspend}}
+      <AdminPenaltyHistory @user={{this.user}} />
 
       <div class="until-controls">
         <label>
-          <FutureDateInput @class="suspend-until" @label="admin.user.suspend_duration" @clearable={{false}} @input={{suspendUntil}} @onChangeInput={{action (mut suspendUntil)}} />
+          <FutureDateInput @class="suspend-until" @label="admin.user.suspend_duration" @clearable={{false}} @input={{this.suspendUntil}} @onChangeInput={{action (mut this.suspendUntil)}} />
         </label>
       </div>
-      <SuspensionDetails @reason={{reason}} @message={{message}} />
+      <SuspensionDetails @reason={{this.reason}} @message={{this.message}} />
 
-      {{#if postId}}
-        <PenaltyPostAction @postId={{postId}} @postAction={{postAction}} @postEdit={{postEdit}} />
+      {{#if this.postId}}
+        <PenaltyPostAction @postId={{this.postId}} @postAction={{this.postAction}} @postEdit={{this.postEdit}} />
       {{/if}}
 
     {{else}}
@@ -30,7 +30,7 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-danger perform-suspend" @action={{action "suspend"}} @disabled={{submitDisabled}} @icon="ban" @label="admin.user.suspend" />
+  <DButton @class="btn-danger perform-suspend" @action={{action "suspend"}} @disabled={{this.submitDisabled}} @icon="ban" @label="admin.user.suspend" />
   <DModalCancel @close={{route-action "closeModal"}} />
-  <ConditionalLoadingSpinner @condition={{loading}} @size="small" />
+  <ConditionalLoadingSpinner @condition={{this.loading}} @size="small" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs
index 11e9b5c6abd..dd27cb7bf0e 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-change.hbs
@@ -1,6 +1,6 @@
 <div>
   <DModalBody @title="admin.logs.staff_actions.modal_title">
-    {{html-safe diff}}
+    {{html-safe this.diff}}
   </DModalBody>
   <div class="modal-footer">
     <DButton @class="btn-primary" @action={{route-action "closeModal"}} @label="close" />
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs
index bcb26896217..0750ecb8648 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-theme-item.hbs
@@ -1,15 +1,15 @@
 <div class="popular-theme-item">
   <div class="popular-theme-name">
-    {{theme.name}}
-    {{#if theme.preview}}
-      <a href={{theme.preview}} title="Preview" rel="noopener noreferrer" target="_blank">{{d-icon "far-eye"}}</a>
+    {{this.theme.name}}
+    {{#if this.theme.preview}}
+      <a href={{this.theme.preview}} title="Preview" rel="noopener noreferrer" target="_blank">{{d-icon "far-eye"}}</a>
     {{/if}}
   </div>
   <div class="popular-theme-buttons">
-    {{#if theme.installed}}
+    {{#if this.theme.installed}}
       <span>{{i18n "admin.customize.theme.installed"}}</span>
     {{else}}
-      <DButton @class="btn-small" @label="admin.customize.theme.install" @disabled={{installDisabled}} @icon="upload" @action={{action "installThemeFromList" theme.value}} />
+      <DButton @class="btn-small" @label="admin.customize.theme.install" @disabled={{this.installDisabled}} @icon="upload" @action={{action "installThemeFromList" this.theme.value}} />
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
index a760891e33d..a7aefa73714 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-uploaded-image-list.hbs
@@ -1,6 +1,6 @@
 <DModalBody @class="uploaded-image-list">
   <div class="selectable-avatars">
-    {{#each images as |image|}}
+    {{#each this.images as |image|}}
       <a href class="selectable-avatar" {{action "remove" image}}>
         {{bound-avatar-template image "huge"}}
       </a>
@@ -11,5 +11,5 @@
 </DModalBody>
 <div class="modal-footer">
   <DButton @action={{action "close"}} @label="close" />
-  <ImagesUploader @uploading={{uploading}} @done={{action "uploadDone"}} @class="pull-right" />
+  <ImagesUploader @uploading={{this.uploading}} @done={{action "uploadDone"}} @class="pull-right" />
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs b/app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs
index 550a537278a..4a49a0c86fb 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/admin-watched-word-test.hbs
@@ -1,20 +1,20 @@
-<DModalBody @rawTitle={{i18n "admin.watched_words.test.modal_title" action=model.name}} @class="watched-words-test-modal">
+<DModalBody @rawTitle={{i18n "admin.watched_words.test.modal_title" action=this.model.name}} @class="watched-words-test-modal">
   <p>{{i18n "admin.watched_words.test.description"}}</p>
-  <Textarea @name="test_value" @value={{value}} @autofocus="autofocus" />
-  {{#if matches}}
+  <Textarea @name="test_value" @value={{this.value}} @autofocus="autofocus" />
+  {{#if this.matches}}
     <p>
       {{i18n "admin.watched_words.test.found_matches"}}
       <ul>
-        {{#if (or isReplace isLink)}}
-          {{#each matches as |match|}}
+        {{#if (or this.isReplace this.isLink)}}
+          {{#each this.matches as |match|}}
             <li>
               <span class="match">{{match.match}}</span>
               &rarr;
               <span class="replacement">{{match.replacement}}</span>
             </li>
           {{/each}}
-        {{else if isTag}}
-          {{#each matches as |match|}}
+        {{else if this.isTag}}
+          {{#each this.matches as |match|}}
             <li>
               <span class="match">{{match.match}}</span>
               &rarr;
@@ -24,7 +24,7 @@
             </li>
           {{/each}}
         {{else}}
-          {{#each matches as |match|}}
+          {{#each this.matches as |match|}}
             <li>{{match}}</li>
           {{/each}}
         {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs b/app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs
index 3a79e51fde5..ddb9fc82a3d 100644
--- a/app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs
+++ b/app/assets/javascripts/admin/addon/templates/modal/site-setting-default-categories.hbs
@@ -1,5 +1,5 @@
-<DModalBody @class="incoming-emails" @rawTitle={{model.key}}>
-  {{i18n "admin.site_settings.default_categories.modal_description" count=model.count}}
+<DModalBody @class="incoming-emails" @rawTitle={{this.model.key}}>
+  {{i18n "admin.site_settings.default_categories.modal_description" count=this.model.count}}
 </DModalBody>
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/admin/addon/templates/permalinks.hbs b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
index b1fcd5fa61e..13d1e1d1b7d 100644
--- a/app/assets/javascripts/admin/addon/templates/permalinks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/permalinks.hbs
@@ -5,10 +5,10 @@
 </div>
 <PermalinkForm @action={{action "recordAdded"}} />
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if model.length}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.model.length}}
     <div class="permalink-search">
-      <TextField @value={{filter}} @class="url-input" @placeholderKey="admin.permalink.form.filter" @autocorrect="off" @autocapitalize="off" />
+      <TextField @value={{this.filter}} @class="url-input" @placeholderKey="admin.permalink.form.filter" @autocorrect="off" @autocapitalize="off" />
     </div>
     <table class="admin-logs-table permalinks grid">
       <thead class="heading-container">
@@ -17,7 +17,7 @@
         <th class="col heading actions"></th>
       </thead>
       <tbody>
-        {{#each model as |pl|}}
+        {{#each this.model as |pl|}}
           <tr class="admin-list-item">
             <td class="col first url">
               <FlatButton @title="admin.permalink.copy_to_clipboard" @icon="far-clipboard" @action={{action "copyUrl" pl}} />
diff --git a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
index fbdd4210b3d..bb8cc190ec6 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins-index.hbs
@@ -1,4 +1,4 @@
-{{#if model.length}}
+{{#if this.model.length}}
   <h3>{{i18n "admin.plugins.installed"}}</h3>
 
   <table class="admin-plugins grid">
@@ -12,7 +12,7 @@
       </tr>
     </thead>
     <tbody>
-      {{#each model as |plugin|}}
+      {{#each this.model as |plugin|}}
         <tr>
           <td>
             {{#if plugin.is_official}}
@@ -51,7 +51,7 @@
             {{/if}}
           </td>
           <td class="settings">
-            {{#if currentUser.admin}}
+            {{#if this.currentUser.admin}}
               {{#if plugin.has_settings}}
                 <DButton @class="btn-default" @action={{route-action "showSettings"}} @actionParam={{plugin}} @icon="cog" @label="admin.plugins.change_settings_short" />
               {{/if}}
@@ -67,4 +67,4 @@
 
 <p class="admin-plugins-howto"><a href="https://meta.discourse.org/t/install-a-plugin/19157">{{i18n "admin.plugins.howto"}}</a></p>
 
-<PluginOutlet @name="admin-below-plugins-index" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="admin-below-plugins-index" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/admin/addon/templates/plugins.hbs b/app/assets/javascripts/admin/addon/templates/plugins.hbs
index f3d69d71c7e..1425cf479ef 100644
--- a/app/assets/javascripts/admin/addon/templates/plugins.hbs
+++ b/app/assets/javascripts/admin/addon/templates/plugins.hbs
@@ -2,7 +2,7 @@
   <div class="controls">
     <DButton @action={{action "toggleMenu"}} @class="menu-toggle" @icon="bars" />
 
-    {{#if currentUser.admin}}
+    {{#if this.currentUser.admin}}
       <DButton @label="admin.plugins.change_settings" @icon="cog" @class="btn-default settings-button" @action={{route-action "showSettings"}} />
     {{/if}}
   </div>
@@ -12,7 +12,7 @@
   <ul class="nav nav-stacked">
     <NavItem @route="adminPlugins.index" @label="admin.plugins.title" />
 
-    {{#each adminRoutes as |route|}}
+    {{#each this.adminRoutes as |route|}}
       <NavItem @route={{route.full_location}} @label={{route.label}} />
     {{/each}}
   </ul>
diff --git a/app/assets/javascripts/admin/addon/templates/reports-show.hbs b/app/assets/javascripts/admin/addon/templates/reports-show.hbs
index 4f761d850a6..5d457dbc753 100644
--- a/app/assets/javascripts/admin/addon/templates/reports-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/reports-show.hbs
@@ -1 +1 @@
-<AdminReport @showAllReportsLink={{true}} @dataSourceName={{model.type}} @filters={{model}} @reportOptions={{reportOptions}} @showFilteringUI={{true}} @onRefresh={{route-action "onParamsChange"}} />
+<AdminReport @showAllReportsLink={{true}} @dataSourceName={{this.model.type}} @filters={{this.model}} @reportOptions={{this.reportOptions}} @showFilteringUI={{true}} @onRefresh={{route-action "onParamsChange"}} />
diff --git a/app/assets/javascripts/admin/addon/templates/search-logs-index.hbs b/app/assets/javascripts/admin/addon/templates/search-logs-index.hbs
index c2c091e1d29..86dcb171f04 100644
--- a/app/assets/javascripts/admin/addon/templates/search-logs-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/search-logs-index.hbs
@@ -1,10 +1,10 @@
 <div class="admin-title">
-  <PeriodChooser @period={{period}} @onChange={{action (mut period)}} />
-  <ComboBox @content={{searchTypeOptions}} @value={{searchType}} @class="search-logs-filter" @onChange={{action (mut searchType)}} />
+  <PeriodChooser @period={{this.period}} @onChange={{action (mut this.period)}} />
+  <ComboBox @content={{this.searchTypeOptions}} @value={{this.searchType}} @class="search-logs-filter" @onChange={{action (mut this.searchType)}} />
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if model.length}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.model.length}}
 
     <table class="search-logs-list grid">
       <thead>
@@ -13,10 +13,10 @@
         <th class="col heading">{{i18n "admin.logs.search_logs.click_through_rate"}}</th>
       </thead>
       <tbody>
-        {{#each model as |item|}}
+        {{#each this.model as |item|}}
           <tr class="admin-list-item">
             <td class="col term">
-              <LinkTo @route="adminSearchLogs.term" @query={{hash term=item.term period=period}} class="test">
+              <LinkTo @route="adminSearchLogs.term" @query={{hash term=item.term period=this.period}} class="test">
                 {{item.term}}
               </LinkTo>
             </td>
diff --git a/app/assets/javascripts/admin/addon/templates/search-logs-term.hbs b/app/assets/javascripts/admin/addon/templates/search-logs-term.hbs
index d90571523a8..133a8f02973 100644
--- a/app/assets/javascripts/admin/addon/templates/search-logs-term.hbs
+++ b/app/assets/javascripts/admin/addon/templates/search-logs-term.hbs
@@ -1,21 +1,21 @@
 <div class="admin-title">
-  <PeriodChooser @period={{period}} @onChange={{action (mut period)}} />
-  <ComboBox @content={{searchTypeOptions}} @value={{searchType}} @class="search-logs-filter" @onChange={{action (mut searchType)}} />
+  <PeriodChooser @period={{this.period}} @onChange={{action (mut this.period)}} />
+  <ComboBox @content={{this.searchTypeOptions}} @value={{this.searchType}} @class="search-logs-filter" @onChange={{action (mut this.searchType)}} />
 </div>
 
 <h2>
-  <LinkTo @route="full-page-search" @query={{hash q=term}}>{{term}}</LinkTo>
+  <LinkTo @route="full-page-search" @query={{hash q=this.term}}>{{this.term}}</LinkTo>
 </h2>
 
-<ConditionalLoadingSpinner @condition={{refreshing}}>
-  <AdminGraph @model={{model}} @type="bar" />
+<ConditionalLoadingSpinner @condition={{this.refreshing}}>
+  <AdminGraph @model={{this.model}} @type="bar" />
 
   <br><br>
   <h2> {{i18n "admin.logs.search_logs.header_search_results"}} </h2>
   <br>
 
   <div class="header-search-results">
-    {{#each model.search_result.posts as |result|}}
+    {{#each this.model.search_result.posts as |result|}}
       <div class="fps-result">
         <div class="author">
           <a href={{result.userPath}} data-user-card={{result.username}}>
@@ -31,7 +31,7 @@
                 {{#if result.useTopicTitleHeadline}}
                   {{html-safe result.topicTitleHeadline}}
                 {{else}}
-                  <HighlightSearch @highlight={{q}}>
+                  <HighlightSearch @highlight={{this.q}}>
                     {{html-safe result.topic.fancyTitle}}
                   </HighlightSearch>
                 {{/if}}
@@ -58,10 +58,10 @@
             </span>
 
             {{#if result.blurb}}
-              {{#if siteSettings.use_pg_headlines_for_excerpt}}
+              {{#if this.siteSettings.use_pg_headlines_for_excerpt}}
                 {{html-safe result.blurb}}
               {{else}}
-                <HighlightSearch @highlight={{highlightQuery}}>
+                <HighlightSearch @highlight={{this.highlightQuery}}>
                   {{html-safe result.blurb}}
                 </HighlightSearch>
               {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs b/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
index b6aa9caa872..a67400dc1bb 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings-category.hbs
@@ -1,9 +1,9 @@
-{{#if filteredContent}}
+{{#if this.filteredContent}}
   <DSection @class="form-horizontal settings">
-    {{#each filteredContent as |setting|}}
+    {{#each this.filteredContent as |setting|}}
       <SiteSetting @setting={{setting}} @afterSave={{route-action "refreshAll"}} />
     {{/each}}
-    {{#if category.hasMore}}
+    {{#if this.category.hasMore}}
       <p class="warning">{{i18n "admin.site_settings.more_than_30_results"}}</p>
     {{/if}}
   </DSection>
diff --git a/app/assets/javascripts/admin/addon/templates/site-settings.hbs b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
index 0e6cdf0f68d..18f59548263 100644
--- a/app/assets/javascripts/admin/addon/templates/site-settings.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-settings.hbs
@@ -3,13 +3,13 @@
   <div class="controls">
     <div class="inline-form">
       <DButton @action={{action "toggleMenu"}} @class="menu-toggle" @icon="bars" />
-      <TextField @id="setting-filter" @value={{filter}} @placeholderKey="type_to_filter" @class="no-blur" />
+      <TextField @id="setting-filter" @value={{this.filter}} @placeholderKey="type_to_filter" @class="no-blur" />
       <DButton @class="btn-default" @id="clear-filter" @action={{action "clearFilter"}} @label="admin.site_settings.clear_filter" />
     </div>
   </div>
   <div class="search controls">
     <label>
-      <Input @type="checkbox" @checked={{onlyOverridden}} />
+      <Input @type="checkbox" @checked={{this.onlyOverridden}} />
       {{i18n "admin.settings.show_overriden"}}
     </label>
   </div>
@@ -17,7 +17,7 @@
 
 <div class="admin-nav pull-left">
   <ul class="nav nav-stacked">
-    {{#each visibleSiteSettings as |category|}}
+    {{#each this.visibleSiteSettings as |category|}}
       <li class={{category.nameKey}}>
         <LinkTo @route="adminSiteSettingsCategory" @model={{category.nameKey}} class={{category.nameKey}}>
           {{category.name}}
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
index 5d726ad92af..4d98c158540 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-edit.hbs
@@ -1,21 +1,21 @@
 <div class="edit-site-text">
   <div class="title">
-    <h3>{{siteText.id}}</h3>
+    <h3>{{this.siteText.id}}</h3>
   </div>
 
   <div class="title">
-    <h4>{{i18n "admin.site_text.locale"}} {{localeFullName}}</h4>
+    <h4>{{i18n "admin.site_text.locale"}} {{this.localeFullName}}</h4>
   </div>
 
-  <ExpandingTextArea @value={{buffered.value}} @rows="1" @class="site-text-value" />
+  <ExpandingTextArea @value={{this.buffered.value}} @rows="1" @class="site-text-value" />
 
-  <SaveControls @model={{siteText}} @action={{action "saveChanges"}} @saved={{saved}} @saveDisabled={{saveDisabled}}>
-    {{#if siteText.can_revert}}
+  <SaveControls @model={{this.siteText}} @action={{action "saveChanges"}} @saved={{this.saved}} @saveDisabled={{this.saveDisabled}}>
+    {{#if this.siteText.can_revert}}
       <DButton @action={{action "revertChanges"}} @label="admin.site_text.revert" @class="revert-site-text" />
     {{/if}}
   </SaveControls>
 
-  <LinkTo @route="adminSiteText.index" @query={{hash locale=locale}} class="go-back">
+  <LinkTo @route="adminSiteText.index" @query={{hash locale=this.locale}} class="go-back">
     {{d-icon "arrow-left"}}
     {{i18n "admin.site_text.go_back"}}
   </LinkTo>
diff --git a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
index 34fcd700a79..da962af60c3 100644
--- a/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/site-text-index.hbs
@@ -1,7 +1,7 @@
 <div class="search-area">
   <p>{{i18n "admin.site_text.description"}}</p>
 
-  <TextField @value={{q}} @placeholderKey="admin.site_text.search" @class="no-blur site-text-search" @autofocus="true" @key-up={{action "search"}} />
+  <TextField @value={{this.q}} @placeholderKey="admin.site_text.search" @class="no-blur site-text-search" @autofocus="true" @key-up={{action "search"}} />
 
   <div class="reseed">
     <DButton @action={{route-action "showReseedModal"}} @class="btn-default" @label="admin.reseed.action.label" @title="admin.reseed.action.title" @icon="sync" />
@@ -10,33 +10,33 @@
   <p class="filter-options">
     <div class="locale">
       <label>{{i18n "admin.site_text.locale"}}</label>
-      <ComboBox @valueProperty="value" @content={{availableLocales}} @value={{locale}} @onChange={{action "updateLocale"}} @class="locale-search" @options={{hash filterable=true}} />
+      <ComboBox @valueProperty="value" @content={{this.availableLocales}} @value={{this.locale}} @onChange={{action "updateLocale"}} @class="locale-search" @options={{hash filterable=true}} />
     </div>
 
     <label>
-      <Input @type="checkbox" @checked={{overridden}} @click={{action "toggleOverridden"}} />
+      <Input @type="checkbox" @checked={{this.overridden}} @click={{action "toggleOverridden"}} />
       {{i18n "admin.site_text.show_overriden"}}
     </label>
   </p>
 </div>
 
-<ConditionalLoadingSpinner @condition={{searching}}>
-  {{#if showFallbackLocaleWarning}}
+<ConditionalLoadingSpinner @condition={{this.searching}}>
+  {{#if this.showFallbackLocaleWarning}}
     <div class="alert alert-info">
       {{d-icon "exclamation-circle"}}
-      {{i18n "admin.site_text.fallback_locale_warning" fallback=fallbackLocaleFullName}}
+      {{i18n "admin.site_text.fallback_locale_warning" fallback=this.fallbackLocaleFullName}}
     </div>
   {{/if}}
 
-  {{#if siteTexts.extras.recommended}}
+  {{#if this.siteTexts.extras.recommended}}
     <p><b>{{i18n "admin.site_text.recommended"}}</b></p>
   {{/if}}
 
-  {{#each siteTexts as |siteText|}}
-    <SiteTextSummary @siteText={{siteText}} @editAction={{action "edit"}} @term={{q}} @searchRegex={{siteTexts.extras.regex}} />
+  {{#each this.siteTexts as |siteText|}}
+    <SiteTextSummary @siteText={{siteText}} @editAction={{action "edit"}} @term={{this.q}} @searchRegex={{this.siteTexts.extras.regex}} />
   {{/each}}
 
-  {{#if siteTexts.extras.has_more}}
+  {{#if this.siteTexts.extras.has_more}}
     <p class="warning">{{i18n "admin.site_text.more_than_50_results"}}</p>
   {{/if}}
 </ConditionalLoadingSpinner>
diff --git a/app/assets/javascripts/admin/addon/templates/user-badges.hbs b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
index 38d322d2a66..0d24ced9738 100644
--- a/app/assets/javascripts/admin/addon/templates/user-badges.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-badges.hbs
@@ -1,28 +1,28 @@
 <div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      <li><LinkTo @route="adminUser" @model={{user}}>{{d-icon "caret-left"}} &nbsp;{{user.username}}</LinkTo></li>
+      <li><LinkTo @route="adminUser" @model={{this.user}}>{{d-icon "caret-left"}} &nbsp;{{this.user.username}}</LinkTo></li>
     </ul>
   </nav>
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
+<ConditionalLoadingSpinner @condition={{this.loading}}>
   <div class="admin-container user-badges">
     <h2>{{i18n "admin.badges.grant_badge"}}</h2>
     <br>
-    {{#if noGrantableBadges}}
+    {{#if this.noGrantableBadges}}
       <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <form class="form-horizontal">
         <div class="control-group">
           <label>{{i18n "admin.badges.badge"}}</label>
-          <ComboBox @value={{selectedBadgeId}} @content={{grantableBadges}} @onChange={{action (mut selectedBadgeId)}} @options={{hash
+          <ComboBox @value={{this.selectedBadgeId}} @content={{this.grantableBadges}} @onChange={{action (mut this.selectedBadgeId)}} @options={{hash
               filterable=true
             }} />
         </div>
         <div class="control-group">
           <label>{{i18n "admin.badges.reason"}}</label>
-          <Input @type="text" @value={{badgeReason}} /><br><small>{{i18n "admin.badges.reason_help"}}</small>
+          <Input @type="text" @value={{this.badgeReason}} /><br><small>{{i18n "admin.badges.reason_help"}}</small>
         </div>
         <DButton @class="btn-primary" @action={{action "grantBadge"}} @type="submit" @label="admin.badges.grant" />
       </form>
@@ -37,7 +37,7 @@
           <th>{{i18n "admin.badges.granted_at"}}</th>
           <th></th>
         </tr>
-        {{#each groupedBadges as |userBadge|}}
+        {{#each this.groupedBadges as |userBadge|}}
           <tr>
             <td><UserBadge @badge={{userBadge.badge}} @count={{userBadge.count}} /></td>
             <td>
@@ -63,7 +63,7 @@
         {{else}}
           <tr>
             <td colspan="5">
-              <p>{{i18n "admin.badges.no_user_badges" name=user.username}}</p>
+              <p>{{i18n "admin.badges.no_user_badges" name=this.user.username}}</p>
             </td>
           </tr>
         {{/each}}
diff --git a/app/assets/javascripts/admin/addon/templates/user-fields.hbs b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
index 66577e8194e..6e874e8c4ce 100644
--- a/app/assets/javascripts/admin/addon/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-fields.hbs
@@ -3,12 +3,12 @@
 
   <p class="desc">{{i18n "admin.user_fields.help"}}</p>
 
-  {{#if model}}
-    {{#each sortedFields as |uf|}}
+  {{#if this.model}}
+    {{#each this.sortedFields as |uf|}}
       <AdminUserFieldItem @userField={{uf}}
-                          @fieldTypes={{fieldTypes}}
-                          @firstField={{sortedFields.firstObject}}
-                          @lastField={{sortedFields.lastObject}}
+                          @fieldTypes={{this.fieldTypes}}
+                          @firstField={{this.sortedFields.firstObject}}
+                          @lastField={{this.sortedFields.lastObject}}
                           @destroyAction={{action "destroy"}}
                           @moveUpAction={{action "moveUp"}}
                           @moveDownAction={{action "moveDown"}}
@@ -16,6 +16,6 @@
     {{/each}}
   {{/if}}
 
-  <DButton @disabled={{createDisabled}} @class="btn-primary" @action={{action "createField"}} @label="admin.user_fields.create" @icon="plus" />
+  <DButton @disabled={{this.createDisabled}} @class="btn-primary" @action={{action "createField"}} @label="admin.user_fields.create" @icon="plus" />
 
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/user-index.hbs b/app/assets/javascripts/admin/addon/templates/user-index.hbs
index b2ba7993a11..8bf8131f57c 100644
--- a/app/assets/javascripts/admin/addon/templates/user-index.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-index.hbs
@@ -1,51 +1,51 @@
-<section class="details {{unless model.active "not-activated"}}">
+<section class="details {{unless this.model.active "not-activated"}}">
   <div class="user-controls">
-    {{#if model.canViewProfile}}
-      <LinkTo @route="user" @model={{model}} class="btn btn-default">
+    {{#if this.model.canViewProfile}}
+      <LinkTo @route="user" @model={{this.model}} class="btn btn-default">
         {{d-icon "user"}}
         {{i18n "admin.user.show_public_profile"}}
       </LinkTo>
     {{/if}}
 
-    {{#if model.can_view_action_logs}}
-      <DButton @action={{action "viewActionLogs"}} @class="btn-default" @actionParam={{model.username}} @icon="far-list-alt" @label="admin.user.action_logs" />
+    {{#if this.model.can_view_action_logs}}
+      <DButton @action={{action "viewActionLogs"}} @class="btn-default" @actionParam={{this.model.username}} @icon="far-list-alt" @label="admin.user.action_logs" />
     {{/if}}
-    {{#if model.active}}
-      {{#if currentUser.admin}}
+    {{#if this.model.active}}
+      {{#if this.currentUser.admin}}
         <DButton @class="btn-default" @action={{action "logOut"}} @icon="power-off" @label="admin.user.log_out" />
       {{/if}}
     {{/if}}
-    <PluginOutlet @name="admin-user-controls-after" @args={{hash model=model}} />
+    <PluginOutlet @name="admin-user-controls-after" @args={{hash model=this.model}} />
   </div>
 
   <div class="display-row username">
-    <AdminEditableField @name="user.username.title" @value={{model.username}} @action={{action "saveUsername"}} @editing={{editingUsername}} />
+    <AdminEditableField @name="user.username.title" @value={{this.model.username}} @action={{action "saveUsername"}} @editing={{this.editingUsername}} />
   </div>
 
   <div class="display-row name">
-    <AdminEditableField @name="user.name.title" @value={{model.name}} @action={{action "saveName"}} @editing={{editingName}} />
+    <AdminEditableField @name="user.name.title" @value={{this.model.name}} @action={{action "saveName"}} @editing={{this.editingName}} />
   </div>
 
-  <PluginOutlet @name="admin-user-below-names" @args={{hash user=model}} />
+  <PluginOutlet @name="admin-user-below-names" @args={{hash user=this.model}} />
 
-  {{#if canCheckEmails}}
+  {{#if this.canCheckEmails}}
     <div class="display-row email">
       <div class="field">{{i18n "user.email.primary"}}</div>
       <div class="value">
-        {{#unless model.active}}
+        {{#unless this.model.active}}
           <div class="controls">{{i18n "admin.users.not_verified"}}</div>
         {{/unless}}
-        {{#if model.email}}
-          <a href="mailto:{{model.email}}">{{model.email}}</a>
+        {{#if this.model.email}}
+          <a href="mailto:{{this.model.email}}">{{this.model.email}}</a>
         {{else}}
-          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
       <div class="controls">
-        {{#if siteSettings.auth_overrides_email}}
+        {{#if this.siteSettings.auth_overrides_email}}
           {{i18n "user.email.auth_override_instructions"}}
-        {{else if model.email}}
-          {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
+        {{else if this.model.email}}
+          {{html-safe (i18n "admin.user.visit_profile" url=this.preferencesPath)}}
         {{/if}}
       </div>
     </div>
@@ -54,10 +54,10 @@
       <div class="field">{{i18n "user.email.secondary"}}</div>
 
       <div class="value">
-        {{#if model.email}}
-          {{#if model.secondary_emails}}
+        {{#if this.model.email}}
+          {{#if this.model.secondary_emails}}
             <ul>
-              {{#each model.secondary_emails as |email| }}
+              {{#each this.model.secondary_emails as |email| }}
                 <li><a href="mailto:{{email}}">{{email}}</a></li>
               {{/each}}
             </ul>
@@ -65,17 +65,17 @@
             {{i18n "user.email.no_secondary"}}
           {{/if}}
         {{else}}
-          <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
 
       <div class="controls">
-        {{#if model.email}}
-          {{#if model.secondary_emails}}
-            {{#if siteSettings.auth_overrides_email}}
+        {{#if this.model.email}}
+          {{#if this.model.secondary_emails}}
+            {{#if this.siteSettings.auth_overrides_email}}
               {{i18n "user.email.auth_override_instructions"}}
             {{else}}
-              {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
+              {{html-safe (i18n "admin.user.visit_profile" url=this.preferencesPath)}}
             {{/if}}
           {{/if}}
         {{/if}}
@@ -83,23 +83,23 @@
     </div>
 
     <div class="display-row bounce-score">
-      <div class="field"><a href={{model.bounceLink}}>{{i18n "admin.user.bounce_score"}}</a></div>
-      <div class="value">{{model.bounceScore}}</div>
+      <div class="field"><a href={{this.model.bounceLink}}>{{i18n "admin.user.bounce_score"}}</a></div>
+      <div class="value">{{this.model.bounceScore}}</div>
       <div class="controls">
-        {{#if model.canResetBounceScore}}
+        {{#if this.model.canResetBounceScore}}
           <DButton @class="btn-default" @action={{action "resetBounceScore"}} @label="admin.user.reset_bounce_score.label" @title="admin.user.reset_bounce_score.title" />
         {{/if}}
-        {{model.bounceScoreExplanation}}
+        {{this.model.bounceScoreExplanation}}
       </div>
     </div>
 
     <div class="display-row associations">
       <div class="field">{{i18n "user.associated_accounts.title"}}</div>
       <div class="value">
-        {{#if associatedAccountsLoaded}}
-          {{associatedAccounts}}
+        {{#if this.associatedAccountsLoaded}}
+          {{this.associatedAccounts}}
         {{else}}
-          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+          <DButton @class="btn-default" @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
         {{/if}}
       </div>
     </div>
@@ -107,44 +107,44 @@
 
   <div class="display-row">
     <div class="field">{{i18n "user.avatar.title"}}</div>
-    <div class="value">{{avatar model imageSize="large"}}</div>
+    <div class="value">{{avatar this.model imageSize="large"}}</div>
     <div class="controls">
-      {{html-safe (i18n "admin.user.visit_profile" url=preferencesPath)}}
+      {{html-safe (i18n "admin.user.visit_profile" url=this.preferencesPath)}}
     </div>
   </div>
 
   <div class="display-row">
-    <AdminEditableField @name="user.title.title" @value={{model.title}} @action={{action "saveTitle"}} @editing={{editingTitle}} />
+    <AdminEditableField @name="user.title.title" @value={{this.model.title}} @action={{action "saveTitle"}} @editing={{this.editingTitle}} />
   </div>
 
   <div class="display-row last-ip">
     <div class="field">{{i18n "user.ip_address.title"}}</div>
-    <div class="value">{{model.ip_address}}</div>
+    <div class="value">{{this.model.ip_address}}</div>
     <div class="controls">
-      {{#if currentUser.staff}}
-        <IpLookup @ip={{model.ip_address}} @userId={{model.id}} />
+      {{#if this.currentUser.staff}}
+        <IpLookup @ip={{this.model.ip_address}} @userId={{this.model.id}} />
       {{/if}}
     </div>
   </div>
 
   <div class="display-row registration-ip">
     <div class="field">{{i18n "user.registration_ip_address.title"}}</div>
-    <div class="value">{{model.registration_ip_address}}</div>
+    <div class="value">{{this.model.registration_ip_address}}</div>
     <div class="controls">
-      {{#if currentUser.staff}}
-        <IpLookup @ip={{model.registration_ip_address}} @userId={{model.id}} />
+      {{#if this.currentUser.staff}}
+        <IpLookup @ip={{this.model.registration_ip_address}} @userId={{this.model.id}} />
       {{/if}}
     </div>
   </div>
 
-  {{#if showBadges}}
+  {{#if this.showBadges}}
     <div class="display-row">
       <div class="field">{{i18n "admin.badges.title"}}</div>
       <div class="value">
-        {{i18n "badges.badge_count" count=model.badge_count}}
+        {{i18n "badges.badge_count" count=this.model.badge_count}}
       </div>
       <div class="controls">
-        <LinkTo @route="adminUser.badges" @model={{model}} class="btn btn-default">
+        <LinkTo @route="adminUser.badges" @model={{this.model}} class="btn btn-default">
           {{d-icon "certificate"}}
           {{i18n "admin.badges.edit_badges"}}
         </LinkTo>
@@ -155,23 +155,23 @@
   <div class="display-row">
     <div class="field">{{i18n "user.second_factor.title"}}</div>
     <div class="value">
-      {{#if model.second_factor_enabled}}
+      {{#if this.model.second_factor_enabled}}
         {{i18n "yes_value"}}
       {{else}}
         {{i18n "no_value"}}
       {{/if}}
     </div>
     <div class="controls">
-      {{#if canDisableSecondFactor}}
+      {{#if this.canDisableSecondFactor}}
         <DButton @class="btn-default" @action={{action "disableSecondFactor"}} @icon="unlock-alt" @label="user.second_factor.disable" />
       {{/if}}
     </div>
   </div>
 </section>
 
-{{#if userFields}}
+{{#if this.userFields}}
   <section class="details">
-    {{#each userFields as |uf|}}
+    {{#each this.userFields as |uf|}}
       <div class="display-row">
         <div class="field">{{uf.name}}</div>
         <div class="value">
@@ -186,32 +186,32 @@
   </section>
 {{/if}}
 
-<PluginOutlet @name="admin-user-details" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="admin-user-details" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
 <section class="details">
   <h1>{{i18n "admin.user.permissions"}}</h1>
 
-  {{#if siteSettings.must_approve_users}}
+  {{#if this.siteSettings.must_approve_users}}
     <div class="display-row">
       <div class="field">{{i18n "admin.users.approved"}}</div>
       <div class="value">
-        {{#if model.approved}}
+        {{#if this.model.approved}}
           {{i18n "admin.user.approved_by"}}
-          <LinkTo @route="adminUser" @model={{model.approvedBy}}>
-            {{avatar model.approvedBy imageSize="small"}}
+          <LinkTo @route="adminUser" @model={{this.model.approvedBy}}>
+            {{avatar this.model.approvedBy imageSize="small"}}
           </LinkTo>
-          <LinkTo @route="adminUser" @model={{model.approvedBy}}>
-            {{model.approvedBy.username}}
+          <LinkTo @route="adminUser" @model={{this.model.approvedBy}}>
+            {{this.model.approvedBy.username}}
           </LinkTo>
         {{else}}
           {{i18n "no_value"}}
         {{/if}}
       </div>
       <div class="controls">
-        {{#if model.approved}}
+        {{#if this.model.approved}}
           {{i18n "admin.user.approve_success"}}
         {{else}}
-          {{#if model.can_approve}}
+          {{#if this.model.can_approve}}
             <DButton @class="btn-default" @action={{action "approve"}} @icon="check" @label="admin.user.approve" />
           {{/if}}
         {{/if}}
@@ -221,18 +221,18 @@
 
   <div class="display-row">
     <div class="field">{{i18n "admin.users.active"}}</div>
-    <div class="value">{{i18n-yes-no model.active}}</div>
+    <div class="value">{{i18n-yes-no this.model.active}}</div>
     <div class="controls">
-      {{#if model.active}}
-        {{#if model.can_deactivate}}
+      {{#if this.model.active}}
+        {{#if this.model.can_deactivate}}
           <DButton @class="btn-default" @action={{action "deactivate"}} @label="admin.user.deactivate_account" />
           {{i18n "admin.user.deactivate_explanation"}}
         {{/if}}
       {{else}}
-        {{#if model.can_send_activation_email}}
+        {{#if this.model.can_send_activation_email}}
           <DButton @class="btn-default" @action={{action "sendActivationEmail"}} @icon="envelope" @label="admin.user.send_activation_email" />
         {{/if}}
-        {{#if model.can_activate}}
+        {{#if this.model.can_activate}}
           <DButton @class="btn-default" @action={{action "activate"}} @icon="check" @label="admin.user.activate" />
         {{/if}}
       {{/if}}
@@ -241,15 +241,15 @@
 
   <div class="display-row">
     <div class="field">{{i18n "admin.user.staged"}}</div>
-    <div class="value">{{i18n-yes-no model.staged}}</div>
+    <div class="value">{{i18n-yes-no this.model.staged}}</div>
     <div class="controls">{{i18n "admin.user.staged_explanation"}}</div>
   </div>
 
-  {{#if currentUser.admin}}
+  {{#if this.currentUser.admin}}
     <div class="display-row">
       <div class="field">{{i18n "admin.api.active_keys"}}</div>
       <div class="value">
-        {{model.api_key_count}}
+        {{this.model.api_key_count}}
       </div>
       <div class="controls">
         <DButton @class="btn-default" @href="/admin/api/keys" @label="admin.api.manage_keys" />
@@ -259,12 +259,12 @@
 
   <div class="display-row">
     <div class="field">{{i18n "admin.user.admin"}}</div>
-    <div class="value">{{i18n-yes-no model.admin}}</div>
+    <div class="value">{{i18n-yes-no this.model.admin}}</div>
     <div class="controls">
-      {{#if model.can_revoke_admin}}
+      {{#if this.model.can_revoke_admin}}
         <DButton @class="btn-default" @action={{action "revokeAdmin"}} @icon="shield-alt" @label="admin.user.revoke_admin" />
       {{/if}}
-      {{#if model.can_grant_admin}}
+      {{#if this.model.can_grant_admin}}
         <DButton @class="btn-default grant-admin" @action={{action "grantAdmin"}} @icon="shield-alt" @label="admin.user.grant_admin" />
       {{/if}}
     </div>
@@ -272,12 +272,12 @@
 
   <div class="display-row">
     <div class="field">{{i18n "admin.user.moderator"}}</div>
-    <div class="value">{{i18n-yes-no model.moderator}}</div>
+    <div class="value">{{i18n-yes-no this.model.moderator}}</div>
     <div class="controls">
-      {{#if model.can_revoke_moderation}}
+      {{#if this.model.can_revoke_moderation}}
         <DButton @class="btn-default" @action={{action "revokeModeration"}} @icon="shield-alt" @label="admin.user.revoke_moderation" />
       {{/if}}
-      {{#if model.can_grant_moderation}}
+      {{#if this.model.can_grant_moderation}}
         <DButton @class="btn-default" @action={{action "grantModeration"}} @icon="shield-alt" @label="admin.user.grant_moderation" />
       {{/if}}
     </div>
@@ -286,9 +286,9 @@
   <div class="display-row">
     <div class="field">{{i18n "trust_level"}}</div>
     <div class="value">
-      <ComboBox @content={{site.trustLevels}} @nameProperty="detailedName" @value={{model.trustLevel.id}} @onChange={{action (mut model.trust_level)}} />
+      <ComboBox @content={{this.site.trustLevels}} @nameProperty="detailedName" @value={{this.model.trustLevel.id}} @onChange={{action (mut this.model.trust_level)}} />
 
-      {{#if model.dirty}}
+      {{#if this.model.dirty}}
         <div>
           <DButton @class="ok no-text" @action={{action "saveTrustLevel"}} @icon="check" />
           <DButton @class="cancel no-text" @action={{action "restoreTrustLevel"}} @icon="times" />
@@ -296,8 +296,8 @@
       {{/if}}
     </div>
     <div class="controls">
-      {{#if model.canLockTrustLevel}}
-        {{#if hasLockedTrustLevel}}
+      {{#if this.model.canLockTrustLevel}}
+        {{#if this.hasLockedTrustLevel}}
           {{d-icon "lock" title="admin.user.trust_level_locked_tip"}}
           <DButton @class="btn-default" @action={{action "lockTrustLevel"}} @actionParam={{false}} @label="admin.user.unlock_trust_level" />
         {{else}}
@@ -305,30 +305,30 @@
           <DButton @class="btn-default" @action={{action "lockTrustLevel"}} @actionParam={{true}} @label="admin.user.lock_trust_level" />
         {{/if}}
       {{/if}}
-      {{#if model.tl3Requirements}}
-        <LinkTo @route="adminUser.tl3Requirements" @model={{model}} class="btn btn-default">
+      {{#if this.model.tl3Requirements}}
+        <LinkTo @route="adminUser.tl3Requirements" @model={{this.model}} class="btn btn-default">
           {{i18n "admin.user.trust_level_3_requirements"}}
         </LinkTo>
       {{/if}}
     </div>
   </div>
 
-  <div class="user-suspended display-row {{if model.suspended "highlight-danger"}}">
+  <div class="user-suspended display-row {{if this.model.suspended "highlight-danger"}}">
     <div class="field">{{i18n "admin.user.suspended"}}</div>
     <div class="value">
-      {{i18n-yes-no model.suspended}}
-      {{#if model.suspended}}
-        {{#unless model.suspendedForever}}
-          {{i18n "admin.user.suspended_until" until=model.suspendedTillDate}}
+      {{i18n-yes-no this.model.suspended}}
+      {{#if this.model.suspended}}
+        {{#unless this.model.suspendedForever}}
+          {{i18n "admin.user.suspended_until" until=this.model.suspendedTillDate}}
         {{/unless}}
       {{/if}}
     </div>
     <div class="controls">
-      {{#if model.suspended}}
+      {{#if this.model.suspended}}
         <DButton @class="btn-danger unsuspend-user" @action={{action "unsuspend"}} @icon="ban" @label="admin.user.unsuspend" />
         {{i18n "admin.user.suspended_explanation"}}
       {{else}}
-        {{#if model.canSuspend}}
+        {{#if this.model.canSuspend}}
           <DButton @class="btn-danger suspend-user" @action={{action "showSuspendModal"}} @icon="ban" @label="admin.user.suspend" />
           {{i18n "admin.user.suspended_explanation"}}
         {{/if}}
@@ -336,37 +336,37 @@
     </div>
   </div>
 
-  {{#if model.suspended}}
+  {{#if this.model.suspended}}
     <div class="display-row highlight-danger suspension-info">
       <div class="field">{{i18n "admin.user.suspended_by"}}</div>
       <div class="value">
-        <LinkTo @route="adminUser" @model={{model.suspendedBy}}>
-          {{avatar model.suspendedBy imageSize="tiny"}}
+        <LinkTo @route="adminUser" @model={{this.model.suspendedBy}}>
+          {{avatar this.model.suspendedBy imageSize="tiny"}}
         </LinkTo>
-        <LinkTo @route="adminUser" @model={{model.suspendedBy}}>
-          {{model.suspendedBy.username}}
+        <LinkTo @route="adminUser" @model={{this.model.suspendedBy}}>
+          {{this.model.suspendedBy.username}}
         </LinkTo>
       </div>
       <div class="controls">
         <b>{{i18n "admin.user.suspend_reason"}}</b>:
-        <div class="full-reason">{{model.full_suspend_reason}}</div>
+        <div class="full-reason">{{this.model.full_suspend_reason}}</div>
       </div>
     </div>
   {{/if}}
 
-  <div class="display-row {{if model.silenced "highlight-danger"}}">
+  <div class="display-row {{if this.model.silenced "highlight-danger"}}">
     <div class="field">{{i18n "admin.user.silenced"}}</div>
     <div class="value">
-      {{i18n-yes-no model.silenced}}
-      {{#if model.silenced}}
-        {{#unless model.silencedForever}}
-          {{i18n "admin.user.suspended_until" until=model.silencedTillDate}}
+      {{i18n-yes-no this.model.silenced}}
+      {{#if this.model.silenced}}
+        {{#unless this.model.silencedForever}}
+          {{i18n "admin.user.suspended_until" until=this.model.silencedTillDate}}
         {{/unless}}
       {{/if}}
     </div>
     <div class="controls">
-      <ConditionalLoadingSpinner @size="small" @condition={{model.silencingUser}}>
-        {{#if model.silenced}}
+      <ConditionalLoadingSpinner @size="small" @condition={{this.model.silencingUser}}>
+        {{#if this.model.silenced}}
           <DButton @class="btn-danger unsilence-user" @action={{action "unsilence"}} @icon="microphone-slash" @label="admin.user.unsilence" />
           {{i18n "admin.user.silence_explanation"}}
         {{else}}
@@ -377,29 +377,29 @@
     </div>
   </div>
 
-  {{#if model.silenced}}
+  {{#if this.model.silenced}}
     <div class="display-row highlight-danger silence-info">
       <div class="field">{{i18n "admin.user.silenced_by"}}</div>
       <div class="value">
-        <LinkTo @route="adminUser" @model={{model.silencedBy}}>
-          {{avatar model.silencedBy imageSize="tiny"}}
+        <LinkTo @route="adminUser" @model={{this.model.silencedBy}}>
+          {{avatar this.model.silencedBy imageSize="tiny"}}
         </LinkTo>
-        <LinkTo @route="adminUser" @model={{model.silencedBy}}>
-          {{model.silencedBy.username}}
+        <LinkTo @route="adminUser" @model={{this.model.silencedBy}}>
+          {{this.model.silencedBy.username}}
         </LinkTo>
       </div>
       <div class="controls">
         <b>{{i18n "admin.user.silence_reason"}}</b>:
-        <div class="full-reason">{{model.silence_reason}}</div>
+        <div class="full-reason">{{this.model.silence_reason}}</div>
       </div>
     </div>
   {{/if}}
 
-  {{#if model.tl3_requirements.penalty_counts.total}}
+  {{#if this.model.tl3_requirements.penalty_counts.total}}
     <div class="display-row clear-penalty-history">
       <div class="field">{{i18n "admin.user.penalty_count"}}</div>
-      <div class="value">{{model.tl3_requirements.penalty_counts.total}}</div>
-      {{#if currentUser.admin}}
+      <div class="value">{{this.model.tl3_requirements.penalty_counts.total}}</div>
+      {{#if this.currentUser.admin}}
         <div class="controls">
           <DButton @label="admin.user.clear_penalty_history.title" @class="btn-default" @icon="times" @action={{action "clearPenaltyHistory"}} />
           {{i18n "admin.user.clear_penalty_history.description"}}
@@ -410,34 +410,34 @@
 
 </section>
 
-{{#if currentUser.admin}}
+{{#if this.currentUser.admin}}
   <section class="details">
     <h1>{{i18n "admin.groups.title"}}</h1>
     <div class="display-row">
       <div class="field">{{i18n "admin.groups.automatic"}}</div>
-      <div class="value">{{html-safe automaticGroups}}</div>
+      <div class="value">{{html-safe this.automaticGroups}}</div>
     </div>
     <div class="display-row">
       <div class="field">{{i18n "admin.groups.custom"}}</div>
       <div class="value">
-        <GroupChooser @content={{availableGroups}} @value={{customGroupIdsBuffer}} @labelProperty="name" @onChange={{action (mut customGroupIdsBuffer)}} />
+        <GroupChooser @content={{this.availableGroups}} @value={{this.customGroupIdsBuffer}} @labelProperty="name" @onChange={{action (mut this.customGroupIdsBuffer)}} />
       </div>
-      {{#if customGroupsDirty}}
+      {{#if this.customGroupsDirty}}
         <div class="controls">
           <DButton @icon="check" @class="ok" @action={{action "saveCustomGroups"}} />
           <DButton @icon="times" @class="cancel" @action={{action "resetCustomGroups"}} />
         </div>
       {{/if}}
     </div>
-    {{#if model.customGroups}}
+    {{#if this.model.customGroups}}
       <div class="display-row">
         <div class="field">{{i18n "admin.groups.primary"}}</div>
         <div class="value">
-          <ComboBox @content={{model.customGroups}} @value={{model.primary_group_id}} @onChange={{action (mut model.primary_group_id)}} @options={{hash
+          <ComboBox @content={{this.model.customGroups}} @value={{this.model.primary_group_id}} @onChange={{action (mut this.model.primary_group_id)}} @options={{hash
               none="admin.groups.no_primary"
             }} />
         </div>
-        {{#if primaryGroupDirty}}
+        {{#if this.primaryGroupDirty}}
           <div class="controls">
             <DButton @icon="check" @class="ok" @action={{action "savePrimaryGroup"}} />
             <DButton @icon="times" @class="cancel" @action={{action "resetPrimaryGroup"}} />
@@ -453,53 +453,53 @@
 
   <div class="display-row">
     <div class="field">{{i18n "created"}}</div>
-    <div class="value">{{format-date model.created_at leaveAgo="true"}}</div>
+    <div class="value">{{format-date this.model.created_at leaveAgo="true"}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.users.last_emailed"}}</div>
-    <div class="value">{{format-date model.last_emailed_at}}</div>
+    <div class="value">{{format-date this.model.last_emailed_at}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "last_seen"}}</div>
-    <div class="value">{{format-date model.last_seen_at leaveAgo="true"}}</div>
+    <div class="value">{{format-date this.model.last_seen_at leaveAgo="true"}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.like_count"}}</div>
-    <div class="value">{{model.like_given_count}} / {{model.like_count}}</div>
+    <div class="value">{{this.model.like_given_count}} / {{this.model.like_count}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.topics_entered"}}</div>
-    <div class="value">{{model.topics_entered}}</div>
+    <div class="value">{{this.model.topics_entered}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.post_count"}}</div>
-    <div class="value">{{model.post_count}}</div>
+    <div class="value">{{this.model.post_count}}</div>
     <div class="controls">
-      {{#if model.can_delete_all_posts}}
-        {{#if model.post_count}}
+      {{#if this.model.can_delete_all_posts}}
+        {{#if this.model.post_count}}
           <DButton @class="btn-danger" @action={{action "showDeletePostsConfirmation"}} @icon="far-trash-alt" @label="admin.user.delete_posts.button" />
         {{/if}}
       {{else}}
-        {{deleteAllPostsExplanation}}
+        {{this.deleteAllPostsExplanation}}
       {{/if}}
     </div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.posts_read_count"}}</div>
-    <div class="value">{{model.posts_read_count}}</div>
+    <div class="value">{{this.model.posts_read_count}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.warnings_received_count"}}</div>
-    <div class="value">{{model.warnings_received_count}}</div>
+    <div class="value">{{this.model.warnings_received_count}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.flags_given_received_count"}}</div>
     <div class="value">
-      {{model.flags_given_count}} / {{model.flags_received_count}}
+      {{this.model.flags_given_count}} / {{this.model.flags_received_count}}
     </div>
     <div class="controls">
-      {{#if model.flags_received_count}}
-        <LinkTo @route="review" @query={{hash username=model.username type="ReviewableFlaggedPost" status="all"}} class="btn">
+      {{#if this.model.flags_received_count}}
+        <LinkTo @route="review" @query={{hash username=this.model.username type="ReviewableFlaggedPost" status="all"}} class="btn">
           {{i18n "admin.user.show_flags_received"}}
         </LinkTo>
       {{/if}}
@@ -507,24 +507,24 @@
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.private_topics_count"}}</div>
-    <div class="value">{{model.private_topics_count}}</div>
+    <div class="value">{{this.model.private_topics_count}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "admin.user.time_read"}}</div>
-    <div class="value">{{format-duration model.time_read}}</div>
+    <div class="value">{{format-duration this.model.time_read}}</div>
   </div>
   <div class="display-row">
     <div class="field">{{i18n "user.invited.days_visited"}}</div>
-    <div class="value">{{html-safe model.days_visited}}</div>
+    <div class="value">{{html-safe this.model.days_visited}}</div>
   </div>
   <div class="display-row post-edits-count">
     <div class="field">{{i18n "admin.user.post_edits_count" }}</div>
     <div class="value">
-      {{if (gt model.post_edits_count 0) model.post_edits_count "0"}}
+      {{if (gt this.model.post_edits_count 0) this.model.post_edits_count "0"}}
     </div>
     <div class="controls">
-      {{#if (gt model.post_edits_count 0) }}
-        <LinkTo @route="adminReports.show" @model="post_edits" @query={{hash filters=postEditsByEditorFilter}} class="btn btn-icon">
+      {{#if (gt this.model.post_edits_count 0) }}
+        <LinkTo @route="adminReports.show" @model="post_edits" @query={{hash filters=this.postEditsByEditorFilter}} class="btn btn-icon">
           {{d-icon "far-eye"}}
           {{i18n "admin.user.view_edits"}}
         </LinkTo>
@@ -533,15 +533,15 @@
   </div>
 </section>
 
-{{#if model.single_sign_on_record}}
+{{#if this.model.single_sign_on_record}}
   <section class="details">
     <h1>{{i18n "admin.user.discourse_connect.title"}}</h1>
 
-    {{#let model.single_sign_on_record as |sso|}}
+    {{#let this.model.single_sign_on_record as |sso|}}
       <div class="display-row">
         <div class="field">{{i18n "admin.user.discourse_connect.external_id"}}</div>
         <div class="value">{{sso.external_id}}</div>
-        {{#if model.can_delete_sso_record}}
+        {{#if this.model.can_delete_sso_record}}
           <div class="controls">
             <DButton @class="btn-danger" @action={{action "deleteSSORecord"}} @icon="far-trash-alt" @label="admin.user.discourse_connect.delete_sso_record" />
           </div>
@@ -555,13 +555,13 @@
         <div class="field">{{i18n "admin.user.discourse_connect.external_name"}}</div>
         <div class="value">{{sso.external_name}}</div>
       </div>
-      {{#if canAdminCheckEmails}}
+      {{#if this.canAdminCheckEmails}}
         <div class="display-row">
           <div class="field">{{i18n "admin.user.discourse_connect.external_email"}}</div>
-          {{#if ssoExternalEmail}}
-            <div class="value">{{ssoExternalEmail}}</div>
+          {{#if this.ssoExternalEmail}}
+            <div class="value">{{this.ssoExternalEmail}}</div>
           {{else}}
-            <DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
+            <DButton @class="btn-default" @action={{action "checkSsoEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @title="admin.users.check_email.title" />
           {{/if}}
         </div>
       {{/if}}
@@ -569,17 +569,17 @@
         <div class="field">{{i18n "admin.user.discourse_connect.external_avatar_url"}}</div>
         <div class="value">{{sso.external_avatar_url}}</div>
       </div>
-      {{#if canAdminCheckEmails}}
+      {{#if this.canAdminCheckEmails}}
         <div class="display-row">
           <div class="field">{{i18n "admin.user.discourse_connect.last_payload"}}</div>
-          {{#if ssoLastPayload}}
+          {{#if this.ssoLastPayload}}
             <div class="value">
-              {{#each ssoPayload as |line|}}
+              {{#each this.ssoPayload as |line|}}
                 {{line}}<br>
               {{/each}}
             </div>
           {{else}}
-            <DButton @class="btn-default" @action={{action "checkSsoPayload"}} @actionParam={{model}} @icon="far-list-alt" @label="admin.users.check_sso.text" @title="admin.users.check_sso.title" />
+            <DButton @class="btn-default" @action={{action "checkSsoPayload"}} @actionParam={{this.model}} @icon="far-list-alt" @label="admin.users.check_sso.text" @title="admin.users.check_sso.title" />
           {{/if}}
         </div>
       {{/if}}
@@ -587,35 +587,35 @@
   </section>
 {{/if}}
 
-<PluginOutlet @name="after-user-details" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="after-user-details" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
 <section>
   <hr>
   <div class="pull-right">
-    {{#if model.active}}
-      {{#if model.can_impersonate}}
+    {{#if this.model.active}}
+      {{#if this.model.can_impersonate}}
         <DButton @class="btn-danger btn-impersonate" @action={{action "impersonate"}} @icon="crosshairs" @label="admin.impersonate.title" @title="admin.impersonate.help" />
       {{/if}}
     {{/if}}
 
-    {{#if model.can_be_anonymized}}
+    {{#if this.model.can_be_anonymized}}
       <DButton @label="admin.user.anonymize" @icon="exclamation-triangle" @class="btn-danger btn-anonymize" @action={{action "anonymize"}} />
     {{/if}}
 
-    {{#if model.canBeDeleted}}
+    {{#if this.model.canBeDeleted}}
       <DButton @label="admin.user.delete" @icon="trash-alt" @class="btn-danger btn-user-delete" @action={{action "destroy"}} />
     {{/if}}
 
-    {{#if model.can_be_merged}}
+    {{#if this.model.can_be_merged}}
       <DButton @label="admin.user.merge.button" @icon="arrows-alt-h" @class="btn-danger btn-user-merge" @action={{action "promptTargetUser"}} />
     {{/if}}
   </div>
 
-  {{#if deleteExplanation}}
+  {{#if this.deleteExplanation}}
     <div class="clearfix"></div>
     <br>
     <div class="pull-right">
-      {{d-icon "exclamation-triangle"}} {{deleteExplanation}}
+      {{d-icon "exclamation-triangle"}} {{this.deleteExplanation}}
     </div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
index f32d4a7185b..e03e74b0547 100644
--- a/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
+++ b/app/assets/javascripts/admin/addon/templates/user-tl3-requirements.hbs
@@ -1,16 +1,16 @@
 <div class="admin-controls">
   <nav>
     <ul class="nav nav-pills">
-      <li><LinkTo @route="adminUser" @model={{model}}>{{d-icon "caret-left"}} &nbsp;{{model.username}}</LinkTo></li>
+      <li><LinkTo @route="adminUser" @model={{this.model}}>{{d-icon "caret-left"}} &nbsp;{{this.model.username}}</LinkTo></li>
       <li><LinkTo @route="adminUsersList.show" @model="member">{{i18n "admin.user.trust_level_2_users"}}</LinkTo></li>
     </ul>
   </nav>
 </div>
 
 <div class="admin-container tl3-requirements">
-  <h2>{{model.username}} - {{i18n "admin.user.tl3_requirements.title"}}</h2>
+  <h2>{{this.model.username}} - {{i18n "admin.user.tl3_requirements.title"}}</h2>
   <br>
-  <p>{{i18n "admin.user.tl3_requirements.table_title" count=model.tl3Requirements.time_period}}</p>
+  <p>{{i18n "admin.user.tl3_requirements.table_title" count=this.model.tl3Requirements.time_period}}</p>
 
   <table class="table" style="width: auto;">
     <thead>
@@ -24,88 +24,88 @@
     <tbody>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.visits"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.days_visited}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.days_visited}}</td>
         <td>
-          {{model.tl3Requirements.days_visited_percent}}% ({{model.tl3Requirements.days_visited}} / {{model.tl3Requirements.time_period}} {{i18n "admin.user.tl3_requirements.days"}})
+          {{this.model.tl3Requirements.days_visited_percent}}% ({{this.model.tl3Requirements.days_visited}} / {{this.model.tl3Requirements.time_period}} {{i18n "admin.user.tl3_requirements.days"}})
         </td>
-        <td>{{model.tl3Requirements.min_days_visited_percent}}%</td>
+        <td>{{this.model.tl3Requirements.min_days_visited_percent}}%</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.topics_replied_to"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.topics_replied_to}}</td>
-        <td>{{#if model.tl3Requirements.capped_topics_replied_to}}&ge; {{/if}}{{model.tl3Requirements.num_topics_replied_to}}</td>
-        <td>{{model.tl3Requirements.min_topics_replied_to}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.topics_replied_to}}</td>
+        <td>{{#if this.model.tl3Requirements.capped_topics_replied_to}}&ge; {{/if}}{{this.model.tl3Requirements.num_topics_replied_to}}</td>
+        <td>{{this.model.tl3Requirements.min_topics_replied_to}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.topics_viewed"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.topics_viewed}}</td>
-        <td>{{model.tl3Requirements.topics_viewed}}</td>
-        <td>{{model.tl3Requirements.min_topics_viewed}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.topics_viewed}}</td>
+        <td>{{this.model.tl3Requirements.topics_viewed}}</td>
+        <td>{{this.model.tl3Requirements.min_topics_viewed}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.topics_viewed_all_time"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.topics_viewed_all_time}}</td>
-        <td>{{model.tl3Requirements.topics_viewed_all_time}}</td>
-        <td>{{model.tl3Requirements.min_topics_viewed_all_time}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.topics_viewed_all_time}}</td>
+        <td>{{this.model.tl3Requirements.topics_viewed_all_time}}</td>
+        <td>{{this.model.tl3Requirements.min_topics_viewed_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.posts_read"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.posts_read}}</td>
-        <td>{{model.tl3Requirements.posts_read}}</td>
-        <td>{{model.tl3Requirements.min_posts_read}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.posts_read}}</td>
+        <td>{{this.model.tl3Requirements.posts_read}}</td>
+        <td>{{this.model.tl3Requirements.min_posts_read}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.posts_read_all_time"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.posts_read_all_time}}</td>
-        <td>{{model.tl3Requirements.posts_read_all_time}}</td>
-        <td>{{model.tl3Requirements.min_posts_read_all_time}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.posts_read_all_time}}</td>
+        <td>{{this.model.tl3Requirements.posts_read_all_time}}</td>
+        <td>{{this.model.tl3Requirements.min_posts_read_all_time}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.flagged_posts"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.flagged_posts}}</td>
-        <td>{{model.tl3Requirements.num_flagged_posts}}</td>
-        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_posts}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.flagged_posts}}</td>
+        <td>{{this.model.tl3Requirements.num_flagged_posts}}</td>
+        <td>{{i18n "max_of_count" count=this.model.tl3Requirements.max_flagged_posts}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.flagged_by_users"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.flagged_by_users}}</td>
-        <td>{{model.tl3Requirements.num_flagged_by_users}}</td>
-        <td>{{i18n "max_of_count" count=model.tl3Requirements.max_flagged_by_users}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.flagged_by_users}}</td>
+        <td>{{this.model.tl3Requirements.num_flagged_by_users}}</td>
+        <td>{{i18n "max_of_count" count=this.model.tl3Requirements.max_flagged_by_users}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.likes_given"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.likes_given}}</td>
-        <td>{{model.tl3Requirements.num_likes_given}}</td>
-        <td>{{model.tl3Requirements.min_likes_given}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.likes_given}}</td>
+        <td>{{this.model.tl3Requirements.num_likes_given}}</td>
+        <td>{{this.model.tl3Requirements.min_likes_given}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.likes_received"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.likes_received}}</td>
-        <td>{{model.tl3Requirements.num_likes_received}}</td>
-        <td>{{model.tl3Requirements.min_likes_received}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.likes_received}}</td>
+        <td>{{this.model.tl3Requirements.num_likes_received}}</td>
+        <td>{{this.model.tl3Requirements.min_likes_received}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.likes_received_days"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.likes_received_days}}</td>
-        <td>{{model.tl3Requirements.num_likes_received_days}}</td>
-        <td>{{model.tl3Requirements.min_likes_received_days}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.likes_received_days}}</td>
+        <td>{{this.model.tl3Requirements.num_likes_received_days}}</td>
+        <td>{{this.model.tl3Requirements.min_likes_received_days}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.likes_received_users"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.likes_received_users}}</td>
-        <td>{{model.tl3Requirements.num_likes_received_users}}</td>
-        <td>{{model.tl3Requirements.min_likes_received_users}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.likes_received_users}}</td>
+        <td>{{this.model.tl3Requirements.num_likes_received_users}}</td>
+        <td>{{this.model.tl3Requirements.min_likes_received_users}}</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.silenced"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.silenced}}</td>
-        <td>{{model.tl3Requirements.penalty_counts.silenced}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.silenced}}</td>
+        <td>{{this.model.tl3Requirements.penalty_counts.silenced}}</td>
         <td>0</td>
       </tr>
       <tr>
         <th>{{i18n "admin.user.tl3_requirements.suspended"}}</th>
-        <td>{{check-icon model.tl3Requirements.met.suspended}}</td>
-        <td>{{model.tl3Requirements.penalty_counts.suspended}}</td>
+        <td>{{check-icon this.model.tl3Requirements.met.suspended}}</td>
+        <td>{{this.model.tl3Requirements.penalty_counts.suspended}}</td>
         <td>0</td>
       </tr>
     </tbody>
@@ -113,10 +113,10 @@
 
   <br>
   <p>
-    {{#if model.istl3}}
-      {{#if model.tl3Requirements.requirements_lost}}
+    {{#if this.model.istl3}}
+      {{#if this.model.tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
-        {{#if model.tl3Requirements.on_grace_period}}
+        {{#if this.model.tl3Requirements.on_grace_period}}
           {{d-icon "times"}}
           {{i18n "admin.user.tl3_requirements.on_grace_period"}}
         {{else}}
@@ -127,28 +127,28 @@
         {{/if}}
       {{else}}
         {{! requirements not lost - remains tl3 }}
-        {{#if model.tl3Requirements.trust_level_locked}}
+        {{#if this.model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
           {{i18n "admin.user.tl3_requirements.locked_will_not_be_demoted"}}
         {{else}}
           {{! tl not locked }}
           {{d-icon "check"}}
           {{i18n "admin.user.tl3_requirements.qualifies"}}
-          {{#if model.tl3Requirements.on_grace_period}}
+          {{#if this.model.tl3Requirements.on_grace_period}}
             {{i18n "admin.user.tl3_requirements.on_grace_period"}}
           {{/if}}
         {{/if}}
       {{/if}}
     {{else}}
       {{! is not tl3 }}
-      {{#if model.tl3Requirements.requirements_met}}
+      {{#if this.model.tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
         {{d-icon "check"}}
         {{i18n "admin.user.tl3_requirements.qualifies"}}
         {{i18n "admin.user.tl3_requirements.will_be_promoted"}}
       {{else}}
         {{! requirements not met - remains regular }}
-        {{#if model.tl3Requirements.trust_level_locked}}
+        {{#if this.model.tl3Requirements.trust_level_locked}}
           {{d-icon "lock"}}
           {{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}
         {{else}}
diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
index 056511986af..970f9e9b90d 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs
@@ -1,7 +1,7 @@
 <div class="admin-title">
-  <h2>{{title}}</h2>
-  {{#if canCheckEmails}}
-    {{#if showEmails}}
+  <h2>{{this.title}}</h2>
+  {{#if this.canCheckEmails}}
+    {{#if this.showEmails}}
       <DButton @action={{action "toggleEmailVisibility"}} @class="hide-emails btn-default" @label="admin.users.hide_emails" />
     {{else}}
       <DButton @action={{action "toggleEmailVisibility"}} @class="show-emails btn-default" @label="admin.users.show_emails" />
@@ -10,28 +10,28 @@
 </div>
 
 <div class="username controls">
-  <TextField @value={{listFilter}} @placeholder={{searchHint}} @title={{searchHint}} />
+  <TextField @value={{this.listFilter}} @placeholder={{this.searchHint}} @title={{this.searchHint}} />
 </div>
 
 <LoadMore @class="users-list-container" @selector=".users-list tr" @action={{action "loadMore"}}>
-  {{#if model}}
+  {{#if this.model}}
     <table class="table users-list grid">
       <thead>
-        <TableHeaderToggle @field="username" @labelKey="username" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @class={{if showEmails "" "hidden"}} @field="email" @labelKey="email" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="last_emailed" @labelKey="admin.users.last_emailed" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="seen" @labelKey="last_seen" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="topics_viewed" @labelKey="admin.user.topics_entered" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="posts_read" @labelKey="admin.user.posts_read_count" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="read_time" @labelKey="admin.user.time_read" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        <TableHeaderToggle @field="created" @labelKey="created" @order={{order}} @asc={{asc}} @automatic={{true}} />
-        {{#if siteSettings.must_approve_users}}
+        <TableHeaderToggle @field="username" @labelKey="username" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @class={{if this.showEmails "" "hidden"}} @field="email" @labelKey="email" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="last_emailed" @labelKey="admin.users.last_emailed" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="seen" @labelKey="last_seen" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="topics_viewed" @labelKey="admin.user.topics_entered" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="posts_read" @labelKey="admin.user.posts_read_count" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="read_time" @labelKey="admin.user.time_read" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        <TableHeaderToggle @field="created" @labelKey="created" @order={{this.order}} @asc={{this.asc}} @automatic={{true}} />
+        {{#if this.siteSettings.must_approve_users}}
           <th>{{i18n "admin.users.approved"}}</th>
         {{/if}}
         <th>&nbsp;</th>
       </thead>
       <tbody>
-        {{#each model as |user|}}
+        {{#each this.model as |user|}}
           <tr class="user {{user.selected}} {{unless user.active "not-activated"}}">
             <td class="username">
               <a href={{user.path}} data-user-card={{user.username}}>
@@ -42,7 +42,7 @@
                 {{d-icon "far-envelope" title="user.staged" }}
               {{/if}}
             </td>
-            <td class="email {{if showEmails "" "hidden"}}">
+            <td class="email {{if this.showEmails "" "hidden"}}">
               {{~user.email~}}
             </td>
 
@@ -80,7 +80,7 @@
               <div>{{format-duration user.created_at_age}}</div>
             </td>
 
-            {{#if siteSettings.must_approve_users}}
+            {{#if this.siteSettings.must_approve_users}}
               <td>{{i18n-yes-no user.approved}}</td>
             {{/if}}
 
@@ -94,13 +94,13 @@
               {{#if user.second_factor_enabled}}
                 {{d-icon "lock" title="admin.user.second_factor_enabled" }}
               {{/if}}
-              <PluginOutlet @name="admin-users-list-icon" @connectorTagName="div" @args={{hash user=user query=query}} />
+              <PluginOutlet @name="admin-users-list-icon" @connectorTagName="div" @args={{hash user=user query=this.query}} />
             </td>
           </tr>
         {{/each}}
       </tbody>
     </table>
-    <ConditionalLoadingSpinner @condition={{refreshing}} />
+    <ConditionalLoadingSpinner @condition={{this.refreshing}} />
   {{else}}
     <p>{{i18n "search.no_results"}}</p>
   {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/users-list.hbs b/app/assets/javascripts/admin/addon/templates/users-list.hbs
index 7e0c27eeda9..1e8f3c633ea 100644
--- a/app/assets/javascripts/admin/addon/templates/users-list.hbs
+++ b/app/assets/javascripts/admin/addon/templates/users-list.hbs
@@ -11,11 +11,11 @@
       <PluginOutlet @name="admin-users-list-nav-after" />
 
       <li class="admin-actions">
-        {{#if currentUser.can_invite_to_forum}}
+        {{#if this.currentUser.can_invite_to_forum}}
           <DButton @class="btn-default" @action={{route-action "sendInvites"}} @title="admin.invite.button_title" @icon="user-plus" @label="admin.invite.button_text" />
         {{/if}}
 
-        {{#if currentUser.admin}}
+        {{#if this.currentUser.admin}}
           <DButton @class="btn-default" @action={{route-action "exportUsers"}} @title="admin.export_csv.button_title.user" @icon="download" @label="admin.export_csv.button_text" />
         {{/if}}
       </li>
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
index d6dd5638ea8..08ceade7092 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
@@ -1,36 +1,36 @@
-{{#if regexpError}}
-  <div class="alert alert-error">{{regexpError}}</div>
+{{#if this.regexpError}}
+  <div class="alert alert-error">{{this.regexpError}}</div>
 {{/if}}
 
 <div class="watched-word-controls">
-  <DButton @class="btn-default download-link" @href={{downloadLink}} @icon="download" @label="admin.watched_words.download" />
+  <DButton @class="btn-default download-link" @href={{this.downloadLink}} @icon="download" @label="admin.watched_words.download" />
 
-  <WatchedWordUploader @id="watched-word-uploader" @uploading={{uploading}} @actionKey={{actionNameKey}} @done={{action "uploadComplete"}} />
+  <WatchedWordUploader @id="watched-word-uploader" @uploading={{this.uploading}} @actionKey={{this.actionNameKey}} @done={{action "uploadComplete"}} />
 
   <DButton @class="watched-word-test" @label="admin.watched_words.test.button_label" @icon="far-eye" @action={{action "test"}} />
 
   <DButton @class="btn-danger clear-all" @label="admin.watched_words.clear_all" @icon="trash-alt" @action={{action "clearAll"}} />
 </div>
 
-<p class="about">{{actionDescription}}</p>
+<p class="about">{{this.actionDescription}}</p>
 
-{{#if siteSettings.watched_words_regular_expressions}}
+{{#if this.siteSettings.watched_words_regular_expressions}}
   <p>{{html-safe (i18n "admin.watched_words.regex_warning" basePath=(base-path))}}</p>
 {{/if}}
 
-<WatchedWordForm @actionKey={{actionNameKey}} @action={{action "recordAdded"}} @filteredContent={{currentAction.words}} />
+<WatchedWordForm @actionKey={{this.actionNameKey}} @action={{action "recordAdded"}} @filteredContent={{this.currentAction.words}} />
 
-{{#if currentAction.words}}
+{{#if this.currentAction.words}}
   <label class="show-words-checkbox">
-    <Input @type="checkbox" @checked={{adminWatchedWords.showWords}} @disabled={{adminWatchedWords.disableShowWords}} />
-    {{i18n "admin.watched_words.show_words" count=currentAction.words.length}}
+    <Input @type="checkbox" @checked={{this.adminWatchedWords.showWords}} @disabled={{this.adminWatchedWords.disableShowWords}} />
+    {{i18n "admin.watched_words.show_words" count=this.currentAction.words.length}}
   </label>
 {{/if}}
 
-{{#if showWordsList}}
-  <div class="watched-words-list watched-words-{{actionNameKey}}">
-    {{#each currentAction.words as |word| }}
-      <div class="watched-word-box"><AdminWatchedWord @actionKey={{actionNameKey}} @word={{word}} @action={{action "recordRemoved"}}/></div>
+{{#if this.showWordsList}}
+  <div class="watched-words-list watched-words-{{this.actionNameKey}}">
+    {{#each this.currentAction.words as |word| }}
+      <div class="watched-word-box"><AdminWatchedWord @actionKey={{this.actionNameKey}} @word={{word}} @action={{action "recordRemoved"}}/></div>
     {{/each}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/addon/templates/watched-words.hbs b/app/assets/javascripts/admin/addon/templates/watched-words.hbs
index 803b0e82dc9..af4070fc0c7 100644
--- a/app/assets/javascripts/admin/addon/templates/watched-words.hbs
+++ b/app/assets/javascripts/admin/addon/templates/watched-words.hbs
@@ -3,7 +3,7 @@
     <div class="controls">
       <div class="inline-form">
         <DButton @action={{action "toggleMenu"}} @class="menu-toggle" @icon="bars" />
-        <TextField @value={{filter}} @placeholderKey="admin.watched_words.search" @class="no-blur" />
+        <TextField @value={{this.filter}} @placeholderKey="admin.watched_words.search" @class="no-blur" />
         <DButton @action={{action "clearFilter"}} @label="admin.watched_words.clear_filter" />
       </div>
     </div>
@@ -11,7 +11,7 @@
 
   <div class="admin-nav pull-left">
     <ul class="nav nav-stacked">
-      {{#each model as |action|}}
+      {{#each this.model as |action|}}
         <li class={{action.nameKey}}>
           <LinkTo @route="adminWatchedWords.action" @model={{action.nameKey}}>
             {{action.name}}
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
index eac48aad00d..8f5f4833876 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show-events.hbs
@@ -2,14 +2,14 @@
   <LinkTo @route="adminWebHooks" @tagName="button" @classNames="btn">
     {{d-icon "list"}} {{i18n "admin.web_hooks.events.go_list"}}
   </LinkTo>
-  <DButton @icon="paper-plane" @label="admin.web_hooks.events.ping" @action={{action "ping"}} @disabled={{pingDisabled}} />
-  <LinkTo @route="adminWebHooks.show" @model={{model.extras.web_hook_id}} @tagName="button" @classNames="btn">
+  <DButton @icon="paper-plane" @label="admin.web_hooks.events.ping" @action={{action "ping"}} @disabled={{this.pingDisabled}} />
+  <LinkTo @route="adminWebHooks.show" @model={{this.model.extras.web_hook_id}} @tagName="button" @classNames="btn">
     {{d-icon "far-edit"}} {{i18n "admin.web_hooks.events.go_details"}}
   </LinkTo>
 </div>
 
 <div class="web-hook-events-listing">
-  {{#if model}}
+  {{#if this.model}}
     <LoadMore @selector=".web-hook-events li" @action={{action "loadMore"}}>
       <div class="web-hook-events content-list">
         <div class="heading-container">
@@ -20,18 +20,18 @@
           <div class="col heading actions">{{i18n "admin.web_hooks.events.actions"}}</div>
           <div class="clearfix"></div>
         </div>
-        {{#if hasIncoming}}
+        {{#if this.hasIncoming}}
           <a href tabindex="0" {{action "showInserted"}} class="alert alert-info clickable">
-            <CountI18n @key="admin.web_hooks.events.incoming" @count={{incomingCount}} />
+            <CountI18n @key="admin.web_hooks.events.incoming" @count={{this.incomingCount}} />
           </a>
         {{/if}}
         <ul>
-          {{#each model as |webHookEvent|}}
+          {{#each this.model as |webHookEvent|}}
             <AdminWebHookEvent @model={{webHookEvent}} />
           {{/each}}
         </ul>
       </div>
-      <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+      <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
     </LoadMore>
   {{else}}
     <p>{{i18n "admin.web_hooks.events.none"}}</p>
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
index 5a17f25e3cf..784985b98cc 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks-show.hbs
@@ -8,37 +8,37 @@
   <form class="web-hook form-horizontal">
     <div class="control-group">
       <label for="payload-url">{{i18n "admin.web_hooks.payload_url"}}</label>
-      <TextField @name="payload-url" @value={{model.payload_url}} @placeholderKey="admin.web_hooks.payload_url_placeholder" />
-      <InputTip @validation={{urlValidation}} />
+      <TextField @name="payload-url" @value={{this.model.payload_url}} @placeholderKey="admin.web_hooks.payload_url_placeholder" />
+      <InputTip @validation={{this.urlValidation}} />
     </div>
 
     <div class="control-group">
       <label for="content-type">{{i18n "admin.web_hooks.content_type"}}</label>
-      <ComboBox @content={{contentTypes}} @name="content-type" @value={{model.content_type}} @onChange={{action (mut model.content_type)}} />
+      <ComboBox @content={{this.contentTypes}} @name="content-type" @value={{this.model.content_type}} @onChange={{action (mut this.model.content_type)}} />
     </div>
 
     <div class="control-group">
       <label for="secret">{{i18n "admin.web_hooks.secret"}}</label>
-      <TextField @name="secret" @value={{model.secret}} @placeholderKey="admin.web_hooks.secret_placeholder" />
-      <InputTip @validation={{secretValidation}} />
+      <TextField @name="secret" @value={{this.model.secret}} @placeholderKey="admin.web_hooks.secret_placeholder" />
+      <InputTip @validation={{this.secretValidation}} />
     </div>
 
     <div class="control-group">
       <label>{{i18n "admin.web_hooks.event_chooser"}}</label>
       <div>
-        <RadioButton @class="subscription-choice" @name="subscription-choice" @value="individual" @selection={{model.webHookType}} />
+        <RadioButton @class="subscription-choice" @name="subscription-choice" @value="individual" @selection={{this.model.webHookType}} />
         {{i18n "admin.web_hooks.individual_event"}}
-        <InputTip @validation={{eventTypeValidation}} />
+        <InputTip @validation={{this.eventTypeValidation}} />
       </div>
-      {{#unless model.wildcard_web_hook}}
+      {{#unless this.model.wildcard_web_hook}}
         <div class="event-selector">
-          {{#each eventTypes as |type|}}
-            <AdminWebHookEventChooser @type={{type}} @model={{model.web_hook_event_types}} />
+          {{#each this.eventTypes as |type|}}
+            <AdminWebHookEventChooser @type={{type}} @model={{this.model.web_hook_event_types}} />
           {{/each}}
         </div>
       {{/unless}}
       <div>
-        <RadioButton @class="subscription-choice" @name="subscription-choice" @value="wildcard" @selection={{model.webHookType}} />
+        <RadioButton @class="subscription-choice" @name="subscription-choice" @value="wildcard" @selection={{this.model.webHookType}} />
         {{i18n "admin.web_hooks.wildcard_event"}}
       </div>
     </div>
@@ -46,47 +46,47 @@
     <div class="filters control-group">
       <div class="filter">
         <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.categories_filter"}}</label>
-        <CategorySelector @categories={{model.categories}} @onChange={{action (mut model.categories)}} />
+        <CategorySelector @categories={{this.model.categories}} @onChange={{action (mut this.model.categories)}} />
         <div class="instructions">{{i18n "admin.web_hooks.categories_filter_instructions"}}</div>
       </div>
-      {{#if showTagsFilter}}
+      {{#if this.showTagsFilter}}
         <div class="filter">
           <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.tags_filter"}}</label>
-          <TagChooser @tags={{model.tag_names}} @everyTag={{true}} @excludeSynonyms={{true}} />
+          <TagChooser @tags={{this.model.tag_names}} @everyTag={{true}} @excludeSynonyms={{true}} />
           <div class="instructions">{{i18n "admin.web_hooks.tags_filter_instructions"}}</div>
         </div>
       {{/if}}
       <div class="filter">
         <label>{{d-icon "circle" class="tracking"}}{{i18n "admin.web_hooks.groups_filter"}}</label>
-        <GroupSelector @groupNames={{model.groupsFilterInName}} @groupFinder={{model.groupFinder}} />
+        <GroupSelector @groupNames={{this.model.groupsFilterInName}} @groupFinder={{this.model.groupFinder}} />
         <div class="instructions">{{i18n "admin.web_hooks.groups_filter_instructions"}}</div>
       </div>
     </div>
 
-    <PluginOutlet @name="web-hook-fields" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+    <PluginOutlet @name="web-hook-fields" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
     <div>
-      <Input @type="checkbox" @name="verify_certificate" @checked={{model.verify_certificate}} /> {{i18n "admin.web_hooks.verify_certificate"}}
+      <Input @type="checkbox" @name="verify_certificate" @checked={{this.model.verify_certificate}} /> {{i18n "admin.web_hooks.verify_certificate"}}
     </div>
     <div>
       <div>
-        <Input @type="checkbox" @name="active" @checked={{model.active}} /> {{i18n "admin.web_hooks.active"}}
+        <Input @type="checkbox" @name="active" @checked={{this.model.active}} /> {{i18n "admin.web_hooks.active"}}
       </div>
-      {{#if model.active}}
+      {{#if this.model.active}}
         <div class="instructions">{{i18n "admin.web_hooks.active_notice"}}</div>
       {{/if}}
     </div>
   </form>
 
   <div class="controls">
-    <DButton @class="btn-default" @translatedLabel={{saveButtonText}} @action={{action "save"}} @disabled={{saveButtonDisabled}} />
+    <DButton @class="btn-default" @translatedLabel={{this.saveButtonText}} @action={{action "save"}} @disabled={{this.saveButtonDisabled}} />
 
-    {{#unless model.isNew}}
+    {{#unless this.model.isNew}}
       <DButton @class="btn-danger" @label="admin.web_hooks.destroy" @action={{action "destroy"}} />
-      <LinkTo @route="adminWebHooks.showEvents" @model={{model.id}} class="btn">
+      <LinkTo @route="adminWebHooks.showEvents" @model={{this.model.id}} class="btn">
         {{i18n "admin.web_hooks.events.go_events"}}
       </LinkTo>
     {{/unless}}
-    <span class="saving">{{savingStatus}}</span>
+    <span class="saving">{{this.savingStatus}}</span>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/addon/templates/web-hooks.hbs b/app/assets/javascripts/admin/addon/templates/web-hooks.hbs
index 328cf6c0073..d92e06ccab2 100644
--- a/app/assets/javascripts/admin/addon/templates/web-hooks.hbs
+++ b/app/assets/javascripts/admin/addon/templates/web-hooks.hbs
@@ -5,7 +5,7 @@
       {{d-icon "plus"}} {{i18n "admin.web_hooks.new"}}
     </LinkTo>
   </div>
-  {{#if model}}
+  {{#if this.model}}
     <LoadMore @selector=".web-hooks tr" @action={{action "loadMore"}}>
       <table class="web-hooks grid">
         <thead>
@@ -17,9 +17,9 @@
           </tr>
         </thead>
         <tbody>
-          {{#each model as |webHook|}}
+          {{#each this.model as |webHook|}}
             <tr>
-              <td class="delivery-status"><LinkTo @route="adminWebHooks.showEvents" @model={{webHook.id}}><AdminWebHookStatus @deliveryStatuses={{deliveryStatuses}} @model={{webHook}} /></LinkTo></td>
+              <td class="delivery-status"><LinkTo @route="adminWebHooks.showEvents" @model={{webHook.id}}><AdminWebHookStatus @deliveryStatuses={{this.deliveryStatuses}} @model={{webHook}} /></LinkTo></td>
               <td class="payload-url"><LinkTo @route="adminWebHooks.show" @model={{webHook}}>{{webHook.payload_url}}</LinkTo></td>
               <td class="description">{{webHook.description}}</td>
               <td class="controls">
@@ -30,7 +30,7 @@
           {{/each}}
         </tbody>
       </table>
-      <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+      <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
     </LoadMore>
   {{else}}
     <p>{{i18n "admin.web_hooks.none"}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/about.hbs b/app/assets/javascripts/discourse/app/templates/about.hbs
index fb70e1b5147..45acef09e24 100644
--- a/app/assets/javascripts/discourse/app/templates/about.hbs
+++ b/app/assets/javascripts/discourse/app/templates/about.hbs
@@ -4,7 +4,7 @@
 
       <ul class="nav-pills">
         <li class="nav-item-about"><LinkTo @route="about" class="active">{{i18n "about.simple_title"}}</LinkTo></li>
-        {{#if faqOverriden}}
+        {{#if this.faqOverriden}}
           <li class="nav-item-guidelines"><LinkTo @route="guidelines">{{i18n "guidelines"}}</LinkTo></li>
           <li class="nav-item-faq"><LinkTo @route="faq">{{i18n "faq"}}</LinkTo></li>
         {{else}}
@@ -15,39 +15,39 @@
       </ul>
 
       <section class="about description">
-        <h2>{{i18n "about.title" title=model.title}}</h2>
-        <p>{{model.description}}</p>
+        <h2>{{i18n "about.title" title=this.model.title}}</h2>
+        <p>{{this.model.description}}</p>
       </section>
 
-      <PluginOutlet @name="about-after-description" @connectorTagName="section" @args={{hash model=model}} />
+      <PluginOutlet @name="about-after-description" @connectorTagName="section" @args={{hash model=this.model}} />
 
-      {{#if model.admins}}
+      {{#if this.model.admins}}
         <section class="about admins">
           <h3>{{d-icon "users"}} {{i18n "about.our_admins"}}</h3>
 
-          <AboutPageUsers @users={{model.admins}} />
+          <AboutPageUsers @users={{this.model.admins}} />
           <div class="clearfix"></div>
 
         </section>
       {{/if}}
 
-      <PluginOutlet @name="about-after-admins" @tagName="span" @connectorTagName="section" @args={{hash model=model}} />
+      <PluginOutlet @name="about-after-admins" @tagName="span" @connectorTagName="section" @args={{hash model=this.model}} />
 
-      {{#if model.moderators}}
+      {{#if this.model.moderators}}
         <section class="about moderators">
           <h3>{{d-icon "users"}} {{i18n "about.our_moderators"}}</h3>
 
           <div class="users">
-            <AboutPageUsers @users={{model.moderators}} />
+            <AboutPageUsers @users={{this.model.moderators}} />
           </div>
           <div class="clearfix"></div>
         </section>
       {{/if}}
 
-      <PluginOutlet @name="about-after-moderators" @tagName="span" @connectorTagName="section" @args={{hash model=model}} />
+      <PluginOutlet @name="about-after-moderators" @tagName="span" @connectorTagName="section" @args={{hash model=this.model}} />
 
-      {{#if model.category_moderators.length}}
-        {{#each model.category_moderators as |cm|}}
+      {{#if this.model.category_moderators.length}}
+        {{#each this.model.category_moderators as |cm|}}
           <section class="about category-moderators moderators-{{cm.category.slug}}">
             <h3>{{category-link cm.category}}{{i18n "about.moderators"}}</h3>
             <div class="users">
@@ -57,7 +57,7 @@
           </section>
         {{/each}}
       {{/if}}
-      {{#if model.can_see_about_stats}}
+      {{#if this.model.can_see_about_stats}}
         <section class="about stats">
           <h3>{{d-icon "far-chart-bar"}}  {{i18n "about.stats"}}</h3>
 
@@ -72,48 +72,48 @@
               </tr>
               <tr>
                 <td class="title">{{i18n "about.topic_count"}}</td>
-                <td>{{number model.stats.topics_last_day}}</td>
-                <td>{{number model.stats.topics_7_days}}</td>
-                <td>{{number model.stats.topics_30_days}}</td>
-                <td>{{number model.stats.topic_count}}</td>
+                <td>{{number this.model.stats.topics_last_day}}</td>
+                <td>{{number this.model.stats.topics_7_days}}</td>
+                <td>{{number this.model.stats.topics_30_days}}</td>
+                <td>{{number this.model.stats.topic_count}}</td>
               </tr>
               <tr>
                 <td>{{i18n "about.post_count"}}</td>
-                <td>{{number model.stats.posts_last_day}}</td>
-                <td>{{number model.stats.posts_7_days}}</td>
-                <td>{{number model.stats.posts_30_days}}</td>
-                <td>{{number model.stats.post_count}}</td>
+                <td>{{number this.model.stats.posts_last_day}}</td>
+                <td>{{number this.model.stats.posts_7_days}}</td>
+                <td>{{number this.model.stats.posts_30_days}}</td>
+                <td>{{number this.model.stats.post_count}}</td>
               </tr>
               <tr>
                 <td>{{i18n "about.user_count"}}</td>
-                <td>{{number model.stats.users_last_day}}</td>
-                <td>{{number model.stats.users_7_days}}</td>
-                <td>{{number model.stats.users_30_days}}</td>
-                <td>{{number model.stats.user_count}}</td>
+                <td>{{number this.model.stats.users_last_day}}</td>
+                <td>{{number this.model.stats.users_7_days}}</td>
+                <td>{{number this.model.stats.users_30_days}}</td>
+                <td>{{number this.model.stats.user_count}}</td>
               </tr>
               <tr>
                 <td>{{i18n "about.active_user_count"}}</td>
-                <td>{{number model.stats.active_users_last_day}}</td>
-                <td>{{number model.stats.active_users_7_days}}</td>
-                <td>{{number model.stats.active_users_30_days}}</td>
+                <td>{{number this.model.stats.active_users_last_day}}</td>
+                <td>{{number this.model.stats.active_users_7_days}}</td>
+                <td>{{number this.model.stats.active_users_30_days}}</td>
                 <td>&mdash;</td>
               </tr>
               <tr>
                 <td>{{i18n "about.like_count"}}</td>
-                <td>{{number model.stats.likes_last_day}}</td>
-                <td>{{number model.stats.likes_7_days}}</td>
-                <td>{{number model.stats.likes_30_days}}</td>
-                <td>{{number model.stats.like_count}}</td>
+                <td>{{number this.model.stats.likes_last_day}}</td>
+                <td>{{number this.model.stats.likes_7_days}}</td>
+                <td>{{number this.model.stats.likes_30_days}}</td>
+                <td>{{number this.model.stats.like_count}}</td>
               </tr>
             </tbody>
           </table>
         </section>
       {{/if}}
 
-      {{#if contactInfo}}
+      {{#if this.contactInfo}}
         <section class="about contact">
           <h3>{{d-icon "far-envelope"}} {{i18n "about.contact"}}</h3>
-          <p>{{html-safe contactInfo}}</p>
+          <p>{{html-safe this.contactInfo}}</p>
         </section>
       {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
index b8232200962..bd3355368eb 100644
--- a/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/account-created/edit-email.hbs
@@ -1,8 +1,8 @@
 <div class="ac-message">
-  <ActivationEmailForm @email={{newEmail}} />
+  <ActivationEmailForm @email={{this.newEmail}} />
 </div>
 
 <div class="activation-controls">
-  <DButton @action={{action "changeEmail"}} @label="login.submit_new_email" @disabled={{submitDisabled}} @class="btn-primary" />
+  <DButton @action={{action "changeEmail"}} @label="login.submit_new_email" @disabled={{this.submitDisabled}} @class="btn-primary" />
   <DButton @action={{action "cancel"}} @label="cancel" @class="edit-cancel" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/account-created/index.hbs b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs
index 2c10296b77e..8532e0351d9 100644
--- a/app/assets/javascripts/discourse/app/templates/account-created/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs
@@ -1,6 +1,6 @@
 <div class="ac-message">
-  {{html-safe accountCreated.message}}
+  {{html-safe this.accountCreated.message}}
 </div>
-{{#if accountCreated.show_controls}}
+{{#if this.accountCreated.show_controls}}
   <ActivationControls @sendActivationEmail={{action "sendActivationEmail"}} @editActivationEmail={{action "editActivationEmail"}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs b/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs
index 17863fd965d..26e33d54b45 100644
--- a/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs
+++ b/app/assets/javascripts/discourse/app/templates/account-created/resent.hbs
@@ -1,6 +1,6 @@
 <div class="ac-message">
-  {{#if email}}
-    {{html-safe (i18n "login.sent_activation_email_again" currentEmail=email)}}
+  {{#if this.email}}
+    {{html-safe (i18n "login.sent_activation_email_again" currentEmail=this.email)}}
   {{else}}
     {{i18n "login.sent_activation_email_again_generic"}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/application.hbs b/app/assets/javascripts/discourse/app/templates/application.hbs
index e5dede3758a..be32149d8d9 100644
--- a/app/assets/javascripts/discourse/app/templates/application.hbs
+++ b/app/assets/javascripts/discourse/app/templates/application.hbs
@@ -2,16 +2,16 @@
   <a href="#main-container" id="skip-link">{{i18n "skip_to_main_content"}}</a>
   <DDocument />
   <PluginOutlet @name="above-site-header" @connectorTagName="div" />
-  <SiteHeader @canSignUp={{canSignUp}} @showCreateAccount={{route-action "showCreateAccount"}} @showLogin={{route-action "showLogin"}} @showKeyboard={{route-action "showKeyboardShortcutsHelp"}} @toggleMobileView={{route-action "toggleMobileView"}} @toggleAnonymous={{route-action "toggleAnonymous"}} @logout={{route-action "logout"}} @toggleSidebar={{action "toggleSidebar"}} />
+  <SiteHeader @canSignUp={{this.canSignUp}} @showCreateAccount={{route-action "showCreateAccount"}} @showLogin={{route-action "showLogin"}} @showKeyboard={{route-action "showKeyboardShortcutsHelp"}} @toggleMobileView={{route-action "toggleMobileView"}} @toggleAnonymous={{route-action "toggleAnonymous"}} @logout={{route-action "logout"}} @toggleSidebar={{action "toggleSidebar"}} />
   <SoftwareUpdatePrompt />
 
-  <PluginOutlet @name="below-site-header" @connectorTagName="div" @args={{hash currentPath=router._router.currentPath}} />
+  <PluginOutlet @name="below-site-header" @connectorTagName="div" @args={{hash currentPath=this.router._router.currentPath}} />
 
   <div id="main-outlet-wrapper" class="wrap" role="main">
 
     <div class="sidebar-wrapper">
       {{!-- empty div allows for animation --}}
-      {{#if (and currentUser.experimental_sidebar_enabled showSidebar)}}
+      {{#if (and this.currentUser.experimental_sidebar_enabled this.showSidebar)}}
         <Sidebar @toggleSidebar={{action "toggleSidebar"}}/>
       {{/if}}
     </div>
@@ -19,14 +19,14 @@
     <div id="main-outlet">
       <PluginOutlet @name="above-main-container" @connectorTagName="div" />
       <div class="container" id="main-container">
-        {{#if showTop}}
+        {{#if this.showTop}}
           <CustomHtml @name="top" />
         {{/if}}
         <NotificationConsentBanner />
         <PwaInstallBanner />
         <GlobalNotice />
         <CreateTopicsNotice />
-        <PluginOutlet @name="top-notices" @connectorTagName="div" @args={{hash currentPath=router._router.currentPath}} />
+        <PluginOutlet @name="top-notices" @connectorTagName="div" @args={{hash currentPath=this.router._router.currentPath}} />
       </div>
 
       {{outlet}}
@@ -34,17 +34,17 @@
     </div>
   </div>
 
-  <PluginOutlet @name="above-footer" @connectorTagName="div" @args={{hash showFooter=showFooter}} />
-  {{#if showFooter}}
+  <PluginOutlet @name="above-footer" @connectorTagName="div" @args={{hash showFooter=this.showFooter}} />
+  {{#if this.showFooter}}
     <CustomHtml @name="footer" @triggerAppEvent="true" @classNames="custom-footer-content" />
   {{/if}}
-  <PluginOutlet @name="below-footer" @connectorTagName="div" @args={{hash showFooter=showFooter}} />
+  <PluginOutlet @name="below-footer" @connectorTagName="div" @args={{hash showFooter=this.showFooter}} />
 
   {{outlet "modal"}}
   <TopicEntrance />
   {{outlet "composer"}}
 
-  {{#if showFooterNav}}
+  {{#if this.showFooterNav}}
     <FooterNav />
   {{/if}}
 </DiscourseRoot>
diff --git a/app/assets/javascripts/discourse/app/templates/badges/index.hbs b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
index 2b321b4a542..5c50b347926 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/index.hbs
@@ -5,14 +5,14 @@
     <PluginOutlet @name="below-badges-title" @tagName="span" @connectorTagName="div" />
 
     <div class="badge-groups">
-      {{#each badgeGroups as |bg|}}
+      {{#each this.badgeGroups as |bg|}}
         <div class="badge-grouping">
           <div class="title">
             <h3>{{bg.badgeGrouping.displayName}}</h3>
           </div>
           <div class="badge-group-list">
             {{#each bg.badges as |b|}}
-              <BadgeCard @badge={{b}} @username={{currentUser.username}} />
+              <BadgeCard @badge={{b}} @username={{this.currentUser.username}} />
             {{/each}}
           </div>
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/badges/show.hbs b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
index 908468863db..be516ec18a9 100644
--- a/app/assets/javascripts/discourse/app/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/badges/show.hbs
@@ -1,21 +1,21 @@
-<div class="container show-badge {{model.slug}}">
+<div class="container show-badge {{this.model.slug}}">
   <h1>
     <LinkTo @route="badges.index">{{i18n "badges.title"}}</LinkTo>
      /
-    {{model.name}}
+    {{this.model.name}}
   </h1>
 
   <div class="show-badge-details">
-    <BadgeCard @badge={{model}} @size="large" @count={{userBadges.grant_count}} />
-    <div class="badge-grant-info {{if hiddenSetTitle "" "hidden"}}">
+    <BadgeCard @badge={{this.model}} @size="large" @count={{this.userBadges.grant_count}} />
+    <div class="badge-grant-info {{if this.hiddenSetTitle "" "hidden"}}">
       <div>
-        {{#if canSelectTitle}}
+        {{#if this.canSelectTitle}}
           <div class="grant-info-item">
             {{i18n "badges.allow_title"}}
             <DButton @class="btn-default pad-left" @action={{action "toggleSetUserTitle"}} @icon="pencil-alt" />
           </div>
         {{/if}}
-        {{#if model.multiple_grant}}
+        {{#if this.model.multiple_grant}}
           <div class="grant-info-item">
             {{i18n "badges.multiple_grant"}}
           </div>
@@ -23,19 +23,19 @@
       </div>
     </div>
 
-    {{#if canSelectTitle}}
-      <div class="badge-set-title {{if hiddenSetTitle "hidden" ""}}">
-        <BadgeTitle @selectableUserBadges={{selectableUserBadges}} />
+    {{#if this.canSelectTitle}}
+      <div class="badge-set-title {{if this.hiddenSetTitle "hidden" ""}}">
+        <BadgeTitle @selectableUserBadges={{this.selectableUserBadges}} />
         <DButton @class="btn-default close-btn" @action={{action "toggleSetUserTitle"}} @label="close" />
       </div>
     {{/if}}
   </div>
 
-  {{#if userBadges}}
-    <div class="user-badges {{model.slug}}">
+  {{#if this.userBadges}}
+    <div class="user-badges {{this.model.slug}}">
       <LoadMore @selector=".badge-info" @action={{action "loadMore"}}>
         <div class="badges-granted">
-          {{#each userBadges as |ub|}}
+          {{#each this.userBadges as |ub|}}
             <UserInfo @user={{ub.user}} @size="medium" @class="badge-info" @date={{ub.granted_at}}>
               <div class="granted-on">{{i18n "badges.granted_on" date=(inline-date ub.granted_at)}}</div>
               {{#if ub.post_number}}
@@ -46,15 +46,15 @@
         </div>
       </LoadMore>
 
-      {{#unless canLoadMore}}
-        {{#if canShowOthers}}
+      {{#unless this.canLoadMore}}
+        {{#if this.canShowOthers}}
           <div>
-            <a id="show-others-with-badge-link" href={{model.url}} class="btn btn-default">{{i18n "badges.others_count" count=othersCount}}</a>
+            <a id="show-others-with-badge-link" href={{this.model.url}} class="btn btn-default">{{i18n "badges.others_count" count=this.othersCount}}</a>
           </div>
         {{/if}}
       {{/unless}}
     </div>
 
-    <ConditionalLoadingSpinner @condition={{canLoadMore}} />
+    <ConditionalLoadingSpinner @condition={{this.canLoadMore}} />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs b/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
index 4215736057d..d619aa83947 100644
--- a/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
+++ b/app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
@@ -1,5 +1,5 @@
-<p>{{i18n (concat "topics.bulk." title)}}</p>
+<p>{{i18n (concat "topics.bulk." this.title)}}</p>
 
-<p><TagChooser @tags={{tags}} @categoryId={{categoryId}} /></p>
+<p><TagChooser @tags={{this.tags}} @categoryId={{this.categoryId}} /></p>
 
-<DButton @action={{this.action}} @disabled={{emptyTags}} @label={{concat "topics.bulk." label}} />
+<DButton @action={{this.action}} @disabled={{this.emptyTags}} @label={{concat "topics.bulk." this.label}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs b/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
index af378b33dfc..bed64bc75f1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/about-page-users.hbs
@@ -1,4 +1,4 @@
-{{#each usersTemplates as |userTemplate|}}
+{{#each this.usersTemplates as |userTemplate|}}
   <div data-username={{userTemplate.username}} class="user-info small">
     <div class="user-image">
       <div class="user-image-inner">
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
index 2b49b2ad1d8..356867efb22 100644
--- a/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/activation-controls.hbs
@@ -1,7 +1,7 @@
-{{#unless siteSettings.must_approve_users}}
-  <DButton @action={{sendActivationEmail}} @label="login.resend_title" @icon="envelope" @class="btn-primary resend" />
+{{#unless this.siteSettings.must_approve_users}}
+  <DButton @action={{this.sendActivationEmail}} @label="login.resend_title" @icon="envelope" @class="btn-primary resend" />
 {{/unless}}
 
-{{#if canEditEmail}}
-  <DButton @action={{editActivationEmail}} @label="login.change_email" @icon="pencil-alt" @class="edit-email" />
+{{#if this.canEditEmail}}
+  <DButton @action={{this.editActivationEmail}} @label="login.change_email" @icon="pencil-alt" @class="edit-email" />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs b/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
index 82c42603ee6..4dd7717fe59 100644
--- a/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/activation-email-form.hbs
@@ -1,2 +1,2 @@
 <p>{{i18n "login.provide_new_email"}}</p>
-<Input @value={{email}} class="activate-new-email" />
+<Input @value={{this.email}} class="activate-new-email" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
index c33db7c9a51..448a66c57fa 100644
--- a/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/avatar-uploader.hbs
@@ -1,13 +1,13 @@
-<label class="btn btn-default btn-icon-text" disabled={{uploading}} title={{i18n "user.change_avatar.upload_title"}}>
+<label class="btn btn-default btn-icon-text" disabled={{this.uploading}} title={{i18n "user.change_avatar.upload_title"}}>
   {{d-icon "far-image"}}
-  {{#if uploading}}
-    {{i18n "uploading"}} {{uploadProgress}}%
+  {{#if this.uploading}}
+    {{i18n "uploading"}} {{this.uploadProgress}}%
   {{else}}
     {{i18n "upload"}}
   {{/if}}
-  <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
+  <input class="hidden-upload-field" disabled={{this.uploading}} type="file" accept="image/*">
 </label>
 
-{{#if imageIsNotASquare}}
+{{#if this.imageIsNotASquare}}
   <div class="warning">{{i18n "user.change_avatar.image_is_not_a_square"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
index de8bbaf7244..998503f68dc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/backup-codes.hbs
@@ -1,15 +1,15 @@
 <div class="wrapper">
-  <textarea id="backupCodes" class="backup-codes-area" rows="10" readonly>{{formattedBackupCodes}}</textarea>
+  <textarea id="backupCodes" class="backup-codes-area" rows="10" readonly>{{this.formattedBackupCodes}}</textarea>
 
   <DButton @action={{action "copyToClipboard"}} @class="backup-codes-copy-btn" @icon="copy" @aria-label="user.second_factor_backup.copy_to_clipboard" @title="user.second_factor_backup.copy_to_clipboard" />
 
-  <a download="{{siteTitleSlug}}-backup-codes.txt"
+  <a download="{{this.siteTitleSlug}}-backup-codes.txt"
      class="btn no-text btn-icon backup-codes-download-btn"
      aria-label={{i18n "user.second_factor_backup.download_backup_codes"}}
      title={{i18n "user.second_factor_backup.download_backup_codes"}}
      rel="noopener noreferrer"
      target="_blank"
-     href="data:application/octet-stream;charset=utf-8;base64,{{base64BackupCode}}">
+     href="data:application/octet-stream;charset=utf-8;base64,{{this.base64BackupCode}}">
     {{d-icon "download"}}
   </a>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
index 2af01ef27ed..a6ece24e8b6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/badge-button.hbs
@@ -1,5 +1,5 @@
-<span class="user-badge {{badge.badgeTypeClassName}} {{unless badge.enabled "disabled"}}" title={{title}} data-badge-name={{badge.name}}>
-  {{icon-or-image badge}}
-  <span class="badge-display-name">{{badge.name}}</span>
+<span class="user-badge {{this.badge.badgeTypeClassName}} {{unless this.badge.enabled "disabled"}}" title={{this.title}} data-badge-name={{this.badge.name}}>
+  {{icon-or-image this.badge}}
+  <span class="badge-display-name">{{this.badge.name}}</span>
   {{yield}}
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
index 58c279989dd..c51e4641b4f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/badge-card.hbs
@@ -1,24 +1,24 @@
-{{#if displayCount}}
-  <a href={{url}} title={{i18n "badges.granted" count=displayCount}} class="grant-count">{{displayCount}}</a>
+{{#if this.displayCount}}
+  <a href={{this.url}} title={{i18n "badges.granted" count=this.displayCount}} class="grant-count">{{this.displayCount}}</a>
 {{/if}}
-{{#if badge.has_badge}}
-  <a href={{url}} class="check-display status-checked">{{d-icon "check"}}</a>
+{{#if this.badge.has_badge}}
+  <a href={{this.url}} class="check-display status-checked">{{d-icon "check"}}</a>
 {{/if}}
 
-{{#if canFavorite}}
-  {{#if isFavorite}}
-    <DButton @icon="star" @class="favorite-btn" @action={{onFavoriteClick}} />
+{{#if this.canFavorite}}
+  {{#if this.isFavorite}}
+    <DButton @icon="star" @class="favorite-btn" @action={{this.onFavoriteClick}} />
   {{else}}
-    <DButton @icon="far-star" @class="favorite-btn" @action={{onFavoriteClick}} @title={{if canFavoriteMoreBadges "badges.favorite_max_not_reached" "badges.favorite_max_reached"}} @disabled={{not canFavoriteMoreBadges}} />
+    <DButton @icon="far-star" @class="favorite-btn" @action={{this.onFavoriteClick}} @title={{if this.canFavoriteMoreBadges "badges.favorite_max_not_reached" "badges.favorite_max_reached"}} @disabled={{not this.canFavoriteMoreBadges}} />
   {{/if}}
 {{/if}}
 
 <div class="badge-contents">
-  <a href={{url}} class="badge-icon {{badge.badgeTypeClassName}}">{{icon-or-image badge}}</a>
+  <a href={{this.url}} class="badge-icon {{this.badge.badgeTypeClassName}}">{{icon-or-image this.badge}}</a>
   <div class="badge-info">
     <div class="badge-info-item">
-      <h3><a href={{url}} class="badge-link">{{badge.name}}</a></h3>
-      <div class="badge-summary">{{html-safe summary}}</div>
+      <h3><a href={{this.url}} class="badge-link">{{this.badge.name}}</a></h3>
+      <div class="badge-summary">{{html-safe this.summary}}</div>
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
index 5ea3c796ec8..495b23d6c3c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/badge-selector.hbs
@@ -1 +1 @@
-<input type="text" placeholder={{placeholder}} name="badges" class="ember-text-field badge-names">
+<input type="text" placeholder={{this.placeholder}} name="badges" class="ember-text-field badge-names">
diff --git a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
index d32973e1dd7..0df8660129a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/badge-title.hbs
@@ -9,14 +9,14 @@
 
       <div class="control-group">
         <div class="controls">
-          <ComboBox @value={{_selectedUserBadgeId}} @nameProperty="badge.name" @content={{selectableUserBadges}} @onChange={{action (mut _selectedUserBadgeId)}} />
+          <ComboBox @value={{this._selectedUserBadgeId}} @nameProperty="badge.name" @content={{this.selectableUserBadges}} @onChange={{action (mut this._selectedUserBadgeId)}} />
         </div>
       </div>
 
       <div class="control-group">
         <div class="controls">
-          <DButton @class="btn-primary" @action={{action "saveBadgeTitle"}} @disabled={{_isSaving}} @label={{if _isSaving "saving" "save"}} />
-          {{#if _isSaved}}
+          <DButton @class="btn-primary" @action={{action "saveBadgeTitle"}} @disabled={{this._isSaving}} @label={{if this._isSaving "saving" "save"}} />
+          {{#if this._isSaved}}
             <span>{{i18n "saved"}}</span>
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
index 87f36da3851..38c2505af42 100644
--- a/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/basic-topic-list.hbs
@@ -1,8 +1,8 @@
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if topics}}
-    <TopicList @showPosters={{showPosters}} @hideCategory={{hideCategory}} @topics={{topics}} @expandExcerpts={{expandExcerpts}} @bulkSelectEnabled={{bulkSelectEnabled}} @bulkSelectAction={{bulkSelectAction}} @canBulkSelect={{canBulkSelect}} @selected={{selected}} @tagsForUser={{tagsForUser}} @onScroll={{onScroll}} @scrollOnLoad={{scrollOnLoad}} @toggleBulkSelect={{toggleBulkSelect}} @updateAutoAddTopicsToBulkSelect={{updateAutoAddTopicsToBulkSelect}} />
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.topics}}
+    <TopicList @showPosters={{this.showPosters}} @hideCategory={{this.hideCategory}} @topics={{this.topics}} @expandExcerpts={{this.expandExcerpts}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @bulkSelectAction={{this.bulkSelectAction}} @canBulkSelect={{this.canBulkSelect}} @selected={{this.selected}} @tagsForUser={{this.tagsForUser}} @onScroll={{this.onScroll}} @scrollOnLoad={{this.scrollOnLoad}} @toggleBulkSelect={{this.toggleBulkSelect}} @updateAutoAddTopicsToBulkSelect={{this.updateAutoAddTopicsToBulkSelect}} />
   {{else}}
-    {{#unless loadingMore}}
+    {{#unless this.loadingMore}}
       <div class="alert alert-info">
         {{i18n "choose_topic.none_found"}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs
index 6d82c0977d2..0058894226d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-icon.hbs
@@ -1 +1 @@
-{{d-icon icon translatedTitle=title class=cssClasses}}
+{{d-icon this.icon translatedTitle=this.title class=this.cssClasses}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
index 7f1daf30654..586e1801db0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark-list.hbs
@@ -1,8 +1,8 @@
-<ConditionalLoadingSpinner @condition={{loading}}>
-  <LoadMore @selector=".bookmark-list .bookmark-list-item" @action={{loadMore}}>
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  <LoadMore @selector=".bookmark-list .bookmark-list-item" @action={{this.loadMore}}>
     <table class="topic-list bookmark-list">
       <thead class="topic-list-header">
-        {{#unless site.mobileView}}
+        {{#unless this.site.mobileView}}
           <th class="topic-list-data">{{i18n "topic.title"}}</th>
           <th class="topic-list-data">&nbsp;</th>
           <th class="post-metadata topic-list-data">{{i18n "post.bookmarks.updated"}}</th>
@@ -11,7 +11,7 @@
         {{/unless}}
       </thead>
       <tbody class="topic-list-body">
-        {{#each content as |bookmark|}}
+        {{#each this.content as |bookmark|}}
           <tr class="topic-list-item bookmark-list-item">
             <td class="main-link topic-list-data" role="rowheader">
               <span class="link-top-line">
@@ -48,10 +48,10 @@
               {{#if bookmark.bookmarkableTopicAlike}}
                 <div class="link-bottom-line">
                   {{category-link bookmark.category}}
-                  {{discourse-tags bookmark mode="list" tagsForUser=tagsForUser}}
+                  {{discourse-tags bookmark mode="list" tagsForUser=this.tagsForUser}}
                 </div>
               {{/if}}
-              {{#if (and site.mobileView bookmark.excerpt bookmark.user.avatar_template)}}
+              {{#if (and this.site.mobileView bookmark.excerpt bookmark.user.avatar_template)}}
                 <a href={{bookmark.bookmarkableUser.path}} data-user-card={{bookmark.user.username}} class="avatar">
                   {{avatar bookmark.bookmarkableUser avatarTemplatePath="avatar_template" usernamePath="username" namePath="name" imageSize="small"}}
                 </a>
@@ -59,7 +59,7 @@
               {{!-- template-lint-disable --}}
               <p class="post-excerpt" {{on "click" this.screenExcerptForExternalLink}}>{{html-safe bookmark.excerpt}}</p>
             </td>
-            {{#unless site.mobileView}}
+            {{#unless this.site.mobileView}}
               <td class="topic-list-data">
                 {{#if bookmark.user.avatar_template}}
                   <a href={{bookmark.user.path}} data-user-card={{bookmark.user.username}} class="avatar">
@@ -77,6 +77,6 @@
         {{/each}}
       </tbody>
     </table>
-    <ConditionalLoadingSpinner @condition={{loadingMore}} />
+    <ConditionalLoadingSpinner @condition={{this.loadingMore}} />
   </LoadMore>
 </ConditionalLoadingSpinner>
diff --git a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
index 6e038c999a9..1a68db973fe 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bookmark.hbs
@@ -1,28 +1,28 @@
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if errorMessage}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.errorMessage}}
     <div class="control-group">
       <div class="controls">
-        <div class="alert alert-error">{{errorMessage}}</div>
+        <div class="alert alert-error">{{this.errorMessage}}</div>
       </div>
     </div>
   {{/if}}
 
   <div class="control-group bookmark-name-wrap">
-    <Input @id="bookmark-name" @value={{model.name}} @name="bookmark-name" class="bookmark-name" @enter={{action "saveAndClose"}} placeholder={{i18n "post.bookmarks.name_placeholder"}} @maxlength="100" />
+    <Input @id="bookmark-name" @value={{this.model.name}} @name="bookmark-name" class="bookmark-name" @enter={{action "saveAndClose"}} placeholder={{i18n "post.bookmarks.name_placeholder"}} @maxlength="100" />
     <DButton @icon="cog" @action={{action "toggleShowOptions"}} @class="bookmark-options-button" @ariaLabel="post.bookmarks.options" />
   </div>
 
-  {{#if showOptions}}
+  {{#if this.showOptions}}
     <div class="bookmark-options-panel">
       <label class="control-label" for="bookmark_auto_delete_preference">{{i18n "bookmarks.auto_delete_preference.label"}}</label>
-      <ComboBox @content={{autoDeletePreferences}} @value={{autoDeletePreference}} @class="bookmark-option-selector" @onChange={{action (mut autoDeletePreference)}} />
+      <ComboBox @content={{this.autoDeletePreferences}} @value={{this.autoDeletePreference}} @class="bookmark-option-selector" @onChange={{action (mut this.autoDeletePreference)}} />
     </div>
   {{/if}}
 
-  {{#if showExistingReminderAt }}
+  {{#if this.showExistingReminderAt }}
     <div class="alert alert-info existing-reminder-at-alert">
       {{d-icon "far-clock"}}
-      <span>{{i18n "bookmarks.reminders.existing_reminder" at_date_time=existingReminderAtFormatted}}</span>
+      <span>{{i18n "bookmarks.reminders.existing_reminder" at_date_time=this.existingReminderAtFormatted}}</span>
     </div>
   {{/if}}
 
@@ -31,8 +31,8 @@
       {{i18n "post.bookmarks.set_reminder"}}
     </label>
 
-    {{#if userHasTimezoneSet}}
-      <TimeShortcutPicker @timeShortcuts={{timeOptions}} @prefilledDatetime={{prefilledDatetime}} @onTimeSelected={{action "onTimeSelected"}} @hiddenOptions={{hiddenTimeShortcutOptions}} @customLabels={{customTimeShortcutLabels}} @_itsatrap={{_itsatrap}} />
+    {{#if this.userHasTimezoneSet}}
+      <TimeShortcutPicker @timeShortcuts={{this.timeOptions}} @prefilledDatetime={{this.prefilledDatetime}} @onTimeSelected={{action "onTimeSelected"}} @hiddenOptions={{this.hiddenTimeShortcutOptions}} @customLabels={{this.customTimeShortcutLabels}} @_itsatrap={{this._itsatrap}} />
     {{else}}
       <div class="alert alert-info">{{html-safe (i18n "bookmarks.no_timezone" basePath=(base-path))}}</div>
     {{/if}}
@@ -41,7 +41,7 @@
   <div class="modal-footer control-group">
     <DButton @id="save-bookmark" @label="bookmarks.save" @class="btn-primary" @action={{action "saveAndClose"}} />
     <DModalCancel @close={{action "closeWithoutSavingBookmark"}} />
-    {{#if showDelete}}
+    {{#if this.showDelete}}
       <DButton @id="delete-bookmark" @icon="trash-alt" @class="delete-bookmark btn-danger" @action={{action "delete"}} />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
index 21fcaeb6987..8b41ec852ee 100644
--- a/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/bread-crumbs.hbs
@@ -1,7 +1,7 @@
-{{#each categoryBreadcrumbs as |breadcrumb|}}
+{{#each this.categoryBreadcrumbs as |breadcrumb|}}
   {{#if breadcrumb.hasOptions}}
     <li>
-      <CategoryDrop @category={{breadcrumb.category}} @categories={{breadcrumb.options}} @tagId={{tag.id}} @editingCategory={{editingCategory}} @editingCategoryTab={{editingCategoryTab}} @options={{hash
+      <CategoryDrop @category={{breadcrumb.category}} @categories={{breadcrumb.options}} @tagId={{this.tag.id}} @editingCategory={{this.editingCategory}} @editingCategoryTab={{this.editingCategoryTab}} @options={{hash
           parentCategory=breadcrumb.parentCategory
           subCategory=breadcrumb.isSubcategory
           noSubcategories=breadcrumb.noSubcategories
@@ -11,16 +11,16 @@
   {{/if}}
 {{/each}}
 
-{{#if showTagsSection}}
-  {{#if additionalTags}}
+{{#if this.showTagsSection}}
+  {{#if this.additionalTags}}
     <li>
-      <TagsIntersectionChooser @currentCategory={{category}} @mainTag={{tag.id}} @additionalTags={{additionalTags}} @options={{hash
-          categoryId=category.id
+      <TagsIntersectionChooser @currentCategory={{this.category}} @mainTag={{this.tag.id}} @additionalTags={{this.additionalTags}} @options={{hash
+          categoryId=this.category.id
         }} />
     </li>
   {{else}}
     <li>
-      <TagDrop @currentCategory={{category}} @noSubcategories={{noSubcategories}} @tagId={{tag.id}} />
+      <TagDrop @currentCategory={{this.category}} @noSubcategories={{this.noSubcategories}} @tagId={{this.tag.id}} />
     </li>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
index cdef7f3c203..a112afac460 100644
--- a/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/cancel-link.hbs
@@ -1,3 +1,3 @@
-<LinkTo @route={{route}} @model={{args}} class="cancel">
+<LinkTo @route={{this.route}} @model={{this.args}} class="cancel">
   {{i18n "cancel"}}
 </LinkTo>
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
index 73b51ca62b7..d0aad86c7fb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-latest-topics.hbs
@@ -1,9 +1,9 @@
 <div class="column categories">
-  <CategoriesOnly @categories={{categories}} />
+  <CategoriesOnly @categories={{this.categories}} />
 </div>
 
 <div class="column">
-  <CategoriesTopicList @topics={{topics}} @filter="latest" @class="latest-topic-list" />
+  <CategoriesTopicList @topics={{this.topics}} @filter="latest" @class="latest-topic-list" />
 </div>
 
 <PluginOutlet @name="extra-categories-column" @connectorTagName="div" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
index 2d33841cca0..dcd76823c2b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-and-top-topics.hbs
@@ -1,9 +1,9 @@
 <div class="column categories">
-  <CategoriesOnly @categories={{categories}} />
+  <CategoriesOnly @categories={{this.categories}} />
 </div>
 
 <div class="column">
-  <CategoriesTopicList @topics={{topics}} @filter="top" @class="top-topic-list" />
+  <CategoriesTopicList @topics={{this.topics}} @filter="top" @class="top-topic-list" />
 </div>
 
 <PluginOutlet @name="extra-categories-column" @connectorTagName="div" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
index 988069494c2..e35b16d0ffe 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-topic.hbs
@@ -1,5 +1,5 @@
-{{d-icon topicStatusIcon}}
+{{d-icon this.topicStatusIcon}}
 
-<a href={{topic.lastUnreadUrl}} class="title">
-  {{html-safe topic.fancyTitle}}
+<a href={{this.topic.lastUnreadUrl}} class="title">
+  {{html-safe this.topic.fancyTitle}}
 </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
index 1a515034835..f2b2c622ec8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes-with-topics.hbs
@@ -1,5 +1,5 @@
-{{#each categories as |c|}}
-  <div data-notification-level={{c.notificationLevelString}} style={{unless noCategoryStyle (html-safe (concat (border-color c.color) (category-color-variable c.color)))}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+{{#each this.categories as |c|}}
+  <div data-notification-level={{c.notificationLevelString}} style={{unless this.noCategoryStyle (html-safe (concat (border-color c.color) (category-color-variable c.color)))}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if this.noCategoryStyle "no-category-boxes-style"}}">
     <div class="category-box-inner">
       <div class="category-box-heading">
         <a href={{c.url}}>
@@ -12,7 +12,7 @@
           <h3>
             <CategoryTitleBefore @category={{c}} />
             {{#if c.read_restricted}}
-              {{d-icon lockIcon}}
+              {{d-icon this.lockIcon}}
             {{/if}}
             {{c.name}}
           </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
index b1da9f26f32..844cc9f0e7f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-boxes.hbs
@@ -1,7 +1,7 @@
-{{#each categories as |c|}}
+{{#each this.categories as |c|}}
   <PluginOutlet @name="category-box-before-each-box" @args={{hash category=c}} />
 
-  <div style={{unless noCategoryStyle (html-safe (concat (border-color c.color) (category-color-variable c.color)))}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} data-url={{c.url}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if noCategoryStyle "no-category-boxes-style"}}">
+  <div style={{unless this.noCategoryStyle (html-safe (concat (border-color c.color) (category-color-variable c.color)))}} data-category-id={{c.id}} data-notification-level={{c.notificationLevelString}} data-url={{c.url}} class="category category-box category-box-{{c.slug}} {{if c.isMuted "muted"}} {{if this.noCategoryStyle "no-category-boxes-style"}}">
     <div class="category-box-inner">
       {{#unless c.isMuted}}
         <div class="category-logo">
@@ -17,7 +17,7 @@
             <h3>
               <CategoryTitleBefore @category={{c}} />
               {{#if c.read_restricted}}
-                {{d-icon lockIcon}}
+                {{d-icon this.lockIcon}}
               {{/if}}
               {{c.name}}
             </h3>
@@ -72,4 +72,4 @@
   <PluginOutlet @name="category-box-after-each-box" @args={{hash category=c}} />
 {{/each}}
 
-<PluginOutlet @name="category-boxes-after-boxes" @args={{hash category=c}} />
+<PluginOutlet @name="category-boxes-after-boxes" @args={{hash category=this.c}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
index 0a7c9889bb5..338e4b1cf50 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-only.hbs
@@ -1,44 +1,44 @@
-{{#if categories}}
-  {{#if filteredCategories}}
-    <table class="category-list {{if showTopics "with-topics"}}">
+{{#if this.categories}}
+  {{#if this.filteredCategories}}
+    <table class="category-list {{if this.showTopics "with-topics"}}">
       <thead>
         <tr>
           <th class="category"><span role="heading" aria-level="2" id="categories-only-category">{{i18n "categories.category"}}</span></th>
           <th class="topics">{{i18n "categories.topics"}}</th>
-          {{#if showTopics}}
+          {{#if this.showTopics}}
             <th class="latest">{{i18n "categories.latest"}}</th>
           {{/if}}
         </tr>
       </thead>
       <tbody aria-labelledby="categories-only-category">
-        {{#each categories as |category|}}
-          <ParentCategoryRow @category={{category}} @showTopics={{showTopics}} />
+        {{#each this.categories as |category|}}
+          <ParentCategoryRow @category={{category}} @showTopics={{this.showTopics}} />
         {{/each}}
       </tbody>
     </table>
   {{/if}}
 
-  {{#if mutedCategories}}
+  {{#if this.mutedCategories}}
     <div class="muted-categories">
       <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
-        {{#if mutedToggleIcon}}
-          {{d-icon mutedToggleIcon}}
+        {{#if this.mutedToggleIcon}}
+          {{d-icon this.mutedToggleIcon}}
         {{/if}}
       </a>
-      <table class="category-list {{if showTopics "with-topics"}} {{unless showMutedCategories "hidden"}}">
+      <table class="category-list {{if this.showTopics "with-topics"}} {{unless this.showMutedCategories "hidden"}}">
         <thead>
           <tr>
             <th class="category"><span role="heading" aria-level="2" id="categories-only-category-muted">{{i18n "categories.category"}}</span></th>
             <th class="topics">{{i18n "categories.topics"}}</th>
-            {{#if showTopics}}
+            {{#if this.showTopics}}
               <th class="latest">{{i18n "categories.latest"}}</th>
             {{/if}}
           </tr>
         </thead>
         <tbody aria-labelledby="categories-only-category-muted">
-          {{#each categories as |category|}}
-            <ParentCategoryRow @category={{category}} @showTopics={{showTopics}} @listType="muted" />
+          {{#each this.categories as |category|}}
+            <ParentCategoryRow @category={{category}} @showTopics={{this.showTopics}} @listType="muted" />
           {{/each}}
         </tbody>
       </table>
@@ -46,4 +46,4 @@
   {{/if}}
 {{/if}}
 
-<PluginOutlet @name="below-categories-only" @connectorTagName="div" @args={{hash categories=categories showTopics=showTopics}} />
+<PluginOutlet @name="below-categories-only" @connectorTagName="div" @args={{hash categories=this.categories showTopics=this.showTopics}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
index b25ccba1a07..3aeb597f8ee 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-topic-list.hbs
@@ -1,17 +1,17 @@
 <div role="heading" aria-level="2" class="table-heading">
-  {{i18n (concat "filters." filter ".title")}}
+  {{i18n (concat "filters." this.filter ".title")}}
   <PluginOutlet @name="categories-topics-table-heading" @connectorTagName="div" />
 </div>
 
-{{#if topics}}
-  {{#each topics as |t|}}
+{{#if this.topics}}
+  {{#each this.topics as |t|}}
     <LatestTopicListItem @topic={{t}} />
   {{/each}}
   <div class="more-topics">
-    <a href={{get-url (concat "/" filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
+    <a href={{get-url (concat "/" this.filter)}} class="btn btn-default pull-right">{{i18n "more"}}</a>
   </div>
 {{else}}
   <div class="no-topics">
-    <h3>{{i18n (concat "topics.none." filter)}}</h3>
+    <h3>{{i18n (concat "topics.none." this.filter)}}</h3>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
index 75eaa9bb810..538c3277187 100644
--- a/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/categories-with-featured-topics.hbs
@@ -1 +1 @@
-<CategoriesOnly @categories={{categories}} @showTopics="true" />
+<CategoriesOnly @categories={{this.categories}} @showTopics="true" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
index c470ef1f2bf..9150f6b6cd6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-name-fields.hbs
@@ -1,12 +1,12 @@
 <section class="field">
-  {{#unless category.isUncategorizedCategory}}
+  {{#unless this.category.isUncategorizedCategory}}
     <section class="field-item">
       <label>{{i18n "category.name"}}</label>
-      <TextField @value={{category.name}} @placeholderKey="category.name_placeholder" @maxlength="50" @class="category-name" />
+      <TextField @value={{this.category.name}} @placeholderKey="category.name_placeholder" @maxlength="50" @class="category-name" />
     </section>
   {{/unless}}
   <section class="field-item">
     <label>{{i18n "category.slug"}}</label>
-    <TextField @value={{category.slug}} @placeholderKey="category.slug_placeholder" @maxlength="255" />
+    <TextField @value={{this.category.slug}} @placeholderKey="category.slug_placeholder" @maxlength="255" />
   </section>
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
index 975c455d177..16e062fda2d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-permission-row.hbs
@@ -1,5 +1,5 @@
 <span class="group-name">
-  <span class="group-name-label">{{group_name}}</span>
+  <span class="group-name-label">{{this.group_name}}</span>
   <a class="remove-permission" href {{action "removeRow"}}>
     {{d-icon "far-trash-alt"}}
   </a>
@@ -7,7 +7,7 @@
 <span class="options actionable">
   <DButton @icon="check-square" @class="btn btn-flat see" @disabled={{true}} />
 
-  <DButton @icon={{canReplyIcon}} @action={{action "setPermissionReply"}} @translatedTitle={{replyTooltip}} @class={{concat "btn btn-flat reply-toggle " replyGranted}} @disabled={{replyDisabled}} />
+  <DButton @icon={{this.canReplyIcon}} @action={{action "setPermissionReply"}} @translatedTitle={{this.replyTooltip}} @class={{concat "btn btn-flat reply-toggle " this.replyGranted}} @disabled={{this.replyDisabled}} />
 
-  <DButton @icon={{canCreateIcon}} @action={{action "setPermissionFull"}} @translatedTitle={{createTooltip}} @class={{concat "btn btn-flat create-toggle " createGranted}} @disabled={{createDisabled}} />
+  <DButton @icon={{this.canCreateIcon}} @action={{action "setPermissionFull"}} @translatedTitle={{this.createTooltip}} @class={{concat "btn btn-flat create-toggle " this.createGranted}} @disabled={{this.createDisabled}} />
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
index 902d051eb0d..9035efa0dfe 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-read-only-banner.hbs
@@ -1,7 +1,7 @@
-{{#if shouldShow}}
+{{#if this.shouldShow}}
   <div class="row">
     <div class="alert alert-info category-read-only-banner">
-      {{html-safe category.read_only_banner}}
+      {{html-safe this.category.read_only_banner}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
index b4cc2ca52cf..c10926639de 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-title-before.hbs
@@ -1 +1 @@
-<PluginOutlet @name="category-title-before" @args={{hash category=category}} />
+<PluginOutlet @name="category-title-before" @args={{hash category=this.category}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
index 0ca2df142c1..e268b9d08ed 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-title-link.hbs
@@ -1,12 +1,12 @@
-<a class="category-title-link" href={{category.url}}>
+<a class="category-title-link" href={{this.category.url}}>
   <div class="category-text-title">
-    <CategoryTitleBefore @category={{category}} />
-    {{#if category.read_restricted}}
-      {{d-icon lockIcon}}
+    <CategoryTitleBefore @category={{this.category}} />
+    {{#if this.category.read_restricted}}
+      {{d-icon this.lockIcon}}
     {{/if}}
-    <span class="category-name">{{dir-span category.name}}</span>
+    <span class="category-name">{{dir-span this.category.name}}</span>
   </div>
-  {{#if category.uploaded_logo.url}}
-    <CdnImg @src={{category.uploaded_logo.url}} @class="category-logo" @width={{category.uploaded_logo.width}} @height={{category.uploaded_logo.height}} @alt="" />
+  {{#if this.category.uploaded_logo.url}}
+    <CdnImg @src={{this.category.uploaded_logo.url}} @class="category-logo" @width={{this.category.uploaded_logo.width}} @height={{this.category.uploaded_logo.height}} @alt="" />
   {{/if}}
 </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs b/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
index f50c843f85c..fda6b0df2fc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/category-unread.hbs
@@ -1,6 +1,6 @@
-{{#if category.unreadTopics}}
-  <a href={{category.unreadUrl}} title={{i18n "topic.unread_topics" count=category.unreadTopics}} class="badge new-posts badge-notification">{{i18n "filters.unread.lower_title_with_count" count=category.unreadTopics}}</a>
+{{#if this.category.unreadTopics}}
+  <a href={{this.category.unreadUrl}} title={{i18n "topic.unread_topics" count=this.category.unreadTopics}} class="badge new-posts badge-notification">{{i18n "filters.unread.lower_title_with_count" count=this.category.unreadTopics}}</a>
 {{/if}}
-{{#if category.newTopics}}
-  <a href={{category.newUrl}} title={{i18n "topic.new_topics" count=category.newTopics}} class="badge new-posts badge-notification">{{i18n "filters.new.lower_title_with_count" count=category.newTopics}}</a>
+{{#if this.category.newTopics}}
+  <a href={{this.category.newUrl}} title={{i18n "topic.new_topics" count=this.category.newTopics}} class="badge new-posts badge-notification">{{i18n "filters.new.lower_title_with_count" count=this.category.newTopics}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
index 3537d414e3d..e09aa5ac34a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/cdn-img.hbs
@@ -1,5 +1,5 @@
-{{#if src}}
-  <div class="{{class}} aspect-image" style={{style}}>
-    <img src={{cdnSrc}} width={{width}} height={{height}} alt={{alt}}>
+{{#if this.src}}
+  <div class="{{this.class}} aspect-image" style={{this.style}}>
+    <img src={{this.cdnSrc}} width={{this.width}} height={{this.height}} alt={{this.alt}}>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
index 6561946c4e9..ce6c36f17d3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-message.hbs
@@ -1,14 +1,14 @@
 <label for="choose-message-title">{{i18n "choose_message.title.search"}}</label>
 
-<TextField @value={{messageTitle}} @placeholderKey="choose_message.title.placeholder" @id="choose-message-title" />
+<TextField @value={{this.messageTitle}} @placeholderKey="choose_message.title.placeholder" @id="choose-message-title" />
 
-{{#if loading}}
+{{#if this.loading}}
   <p>{{i18n "loading"}}</p>
 {{else}}
-  {{#if noResults}}
+  {{#if this.noResults}}
     <p>{{i18n "choose_message.none_found"}}</p>
   {{else}}
-    {{#each messages as |m|}}
+    {{#each this.messages as |m|}}
       <div class="controls existing-message">
         <label class="radio">
           <input id="choose-message-{{m.id}}" {{action "chooseMessage" m}} type="radio" name="choose_message_id">
diff --git a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
index fcd59e1ed26..cf4566d325f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/choose-topic.hbs
@@ -1,23 +1,23 @@
 <label for="choose-topic-title">
-  {{#if labelIcon}}
-    {{d-icon labelIcon}}
+  {{#if this.labelIcon}}
+    {{d-icon this.labelIcon}}
   {{/if}}
-  <span>{{i18n labelText}}</span>
+  <span>{{i18n this.labelText}}</span>
 </label>
 
-<TextField @value={{topicTitle}} @placeholderKey="choose_topic.title.placeholder" @id="choose-topic-title" />
+<TextField @value={{this.topicTitle}} @placeholderKey="choose_topic.title.placeholder" @id="choose-topic-title" />
 
-{{#if loading}}
+{{#if this.loading}}
   <p>{{i18n "loading"}}</p>
 {{else}}
-  {{#if noResults}}
+  {{#if this.noResults}}
     <p>{{i18n "choose_topic.none_found"}}</p>
   {{else}}
     <div class="choose-topic-list">
-      {{#each topics as |t|}}
+      {{#each this.topics as |t|}}
         <div class="controls existing-topic">
           <label class="radio">
-            <Input @id={{concat "choose-topic-" t.id}} @checked={{eq t.id selectedTopicId}} @click={{action "chooseTopic" t}} @type="radio" @name="choose_topic_id" />
+            <Input @id={{concat "choose-topic-" t.id}} @checked={{eq t.id this.selectedTopicId}} @click={{action "chooseTopic" t}} @type="radio" @name="choose_topic_id" />
             <TopicStatus @topic={{t}} @disableActions={{true}} />
             <span class="topic-title">
               {{replace-emoji t.fancy_title}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/color-input.hbs b/app/assets/javascripts/discourse/app/templates/components/color-input.hbs
index 9c5ab4433ab..cb1e4f9e7ba 100644
--- a/app/assets/javascripts/discourse/app/templates/components/color-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/color-input.hbs
@@ -1,2 +1,2 @@
-{{#if onlyHex}}<span class="add-on">#</span>{{/if}}<TextField @class="hex-input" @value={{hexValue}} @maxlength={{maxlength}} @input={{action "onHexInput" value="target.value"}} />
-<input class="picker" type="color" value={{normalizedHexValue}} {{on "input" this.onPickerInput}}>
+{{#if this.onlyHex}}<span class="add-on">#</span>{{/if}}<TextField @class="hex-input" @value={{this.hexValue}} @maxlength={{this.maxlength}} @input={{action "onHexInput" value="target.value"}} />
+<input class="picker" type="color" value={{this.normalizedHexValue}} {{on "input" this.onPickerInput}}>
diff --git a/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
index b33c5463162..823508cbc2a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/color-picker.hbs
@@ -1,5 +1,5 @@
-{{#each colors as |c|}}
-  <ColorPickerChoice @color={{c}} @usedColors={{usedColors}} @selectColor={{action "selectColor"}}>
+{{#each this.colors as |c|}}
+  <ColorPickerChoice @color={{c}} @usedColors={{this.usedColors}} @selectColor={{action "selectColor"}}>
     {{d-icon "check"}}
   </ColorPickerChoice>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
index ace38619ae2..2f187319bda 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-action-title.hbs
@@ -1,7 +1,7 @@
-<ComposerActions @composerModel={{model}} @replyOptions={{model.replyOptions}} @canWhisper={{canWhisper}} @openComposer={{openComposer}} @closeComposer={{closeComposer}} @action={{model.action}} @tabindex={{tabindex}} @topic={{model.topic}} @post={{model.post}} @whisper={{model.whisper}} @noBump={{model.noBump}} @options={{hash
+<ComposerActions @composerModel={{this.model}} @replyOptions={{this.model.replyOptions}} @canWhisper={{this.canWhisper}} @openComposer={{this.openComposer}} @closeComposer={{this.closeComposer}} @action={{this.model.action}} @tabindex={{this.tabindex}} @topic={{this.model.topic}} @post={{this.model.post}} @whisper={{this.model.whisper}} @noBump={{this.model.noBump}} @options={{hash
     mobilePlacementStrategy="fixed"
   }} />
 
 <span class="action-title">
-  {{actionTitle}}
+  {{this.actionTitle}}
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
index fce455b4192..725789abf4a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-editor.hbs
@@ -1,7 +1,7 @@
-<DEditor @value={{composer.reply}} @placeholder={{replyPlaceholder}} @previewUpdated={{action "previewUpdated"}} @markdownOptions={{markdownOptions}} @extraButtons={{action "extraButtons"}} @importQuote={{action "importQuote"}} @showUploadModal={{showUploadModal}} @togglePreview={{action "togglePreview"}} @processPreview={{processPreview}} @validation={{validation}} @loading={{composer.loading}} @forcePreview={{forcePreview}} @showLink={{showLink}} @composerEvents={{true}} @onExpandPopupMenuOptions={{action "onExpandPopupMenuOptions"}} @onPopupMenuAction={{onPopupMenuAction}} @popupMenuOptions={{popupMenuOptions}} @disabled={{disableTextarea}} @outletArgs={{hash composer=composer editorType="composer"}}>
+<DEditor @value={{this.composer.reply}} @placeholder={{this.replyPlaceholder}} @previewUpdated={{action "previewUpdated"}} @markdownOptions={{this.markdownOptions}} @extraButtons={{action "extraButtons"}} @importQuote={{action "importQuote"}} @showUploadModal={{this.showUploadModal}} @togglePreview={{action "togglePreview"}} @processPreview={{this.processPreview}} @validation={{this.validation}} @loading={{this.composer.loading}} @forcePreview={{this.forcePreview}} @showLink={{this.showLink}} @composerEvents={{true}} @onExpandPopupMenuOptions={{action "onExpandPopupMenuOptions"}} @onPopupMenuAction={{this.onPopupMenuAction}} @popupMenuOptions={{this.popupMenuOptions}} @disabled={{this.disableTextarea}} @outletArgs={{hash composer=this.composer editorType="composer"}}>
   {{yield}}
 </DEditor>
 
-{{#if allowUpload}}
+{{#if this.allowUpload}}
   <PickFilesButton @fileInputId="file-uploader" @allowMultiple={{true}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
index 60aa15fbeeb..5565e1e7231 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-messages.hbs
@@ -1,3 +1,3 @@
-{{#each messages as |message|}}
+{{#each this.messages as |message|}}
   <ComposerMessage @message={{message}} @closeMessage={{action "closeMessage"}} @shareModal={{action "shareModal"}} @switchPM={{action "switchPM"}} />
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
index f192ecbdc01..a6fb1797db6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-title.hbs
@@ -1,3 +1,3 @@
-<TextField @value={{composer.title}} @id="reply-title" @maxLength={{titleMaxLength}} @placeholderKey={{composer.titlePlaceholder}} @aria-label={{I18n composer.titlePlaceholder}} @disabled={{disabled}} @autocomplete="off" />
+<TextField @value={{this.composer.title}} @id="reply-title" @maxLength={{this.titleMaxLength}} @placeholderKey={{this.composer.titlePlaceholder}} @aria-label={{I18n this.composer.titlePlaceholder}} @disabled={{this.disabled}} @autocomplete="off" />
 
-<PopupInputTip @validation={{validation}} />
+<PopupInputTip @validation={{this.validation}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
index 9668f4f6c9c..a0c91bf1f25 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-toggles.hbs
@@ -1,13 +1,13 @@
 <div class="composer-controls">
   <PluginOutlet @name="before-composer-toggles" @tagName="span" @connectorTagName="div" />
 
-  {{#if site.mobileView}}
-    <DButton @class="btn-flat toggle-toolbar btn-mini-toggle" @icon="bars" @action={{toggleToolbar}} @title={{toggleToolbarTitle}} @preventFocus={{true}} @tabindex={{-1}} />
+  {{#if this.site.mobileView}}
+    <DButton @class="btn-flat toggle-toolbar btn-mini-toggle" @icon="bars" @action={{this.toggleToolbar}} @title={{this.toggleToolbarTitle}} @preventFocus={{true}} @tabindex={{-1}} />
   {{/if}}
 
-  <DButton @class="btn-flat toggler toggle-minimize btn-mini-toggle" @icon={{toggleIcon}} @action={{toggleComposer}} @title={{toggleTitle}} @tabindex={{-1}} />
+  <DButton @class="btn-flat toggler toggle-minimize btn-mini-toggle" @icon={{this.toggleIcon}} @action={{this.toggleComposer}} @title={{this.toggleTitle}} @tabindex={{-1}} />
 
-  {{#if showFullScreenButton}}
-    <DButton @class="btn-flat toggle-fullscreen btn-mini-toggle" @icon={{fullscreenIcon}} @action={{toggleFullscreen}} @title={{fullscreenTitle}} @tabindex={{-1}} />
+  {{#if this.showFullScreenButton}}
+    <DButton @class="btn-flat toggle-fullscreen btn-mini-toggle" @icon={{this.fullscreenIcon}} @action={{this.toggleFullscreen}} @title={{this.fullscreenTitle}} @tabindex={{-1}} />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
index df79751a1b5..130ea55b4ba 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
@@ -1,7 +1,7 @@
-<EmailGroupUserChooser @id="private-message-users" @value={{splitRecipients}} @onChange={{action "updateRecipients"}} @options={{hash
-    topicId=topicId
+<EmailGroupUserChooser @id="private-message-users" @value={{this.splitRecipients}} @onChange={{action "updateRecipients"}} @options={{hash
+    topicId=this.topicId
     none="composer.users_placeholder"
     includeMessageableGroups=true
-    allowEmails=currentUser.can_send_private_email_messages
+    allowEmails=this.currentUser.can_send_private_email_messages
     autoWrap=true
   }} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
index b97ce25a01f..3d92bf134a6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-section.hbs
@@ -1,6 +1,6 @@
-{{#if isLoading}}
-  <span class="title">{{title}}</span>
-  <div class="spinner {{size}}"></div>
+{{#if this.isLoading}}
+  <span class="title">{{this.title}}</span>
+  <div class="spinner {{this.size}}"></div>
 {{else}}
   {{yield}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
index e18527be3a8..7970d79fcdf 100644
--- a/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/conditional-loading-spinner.hbs
@@ -1,5 +1,5 @@
-{{#if condition}}
-  <div class="spinner {{size}}"></div>
+{{#if this.condition}}
+  <div class="spinner {{this.size}}"></div>
 {{else}}
   {{yield}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs b/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
index 1732a781917..4a0beb53b34 100644
--- a/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/cook-text.hbs
@@ -1 +1 @@
-{{cooked}}
+{{this.cooked}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs b/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
index 6e06af71d8b..68d2efe3702 100644
--- a/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/copy-button.hbs
@@ -1 +1 @@
-<DButton @class={{copyClass}} @icon={{copyIcon}} @action={{action "copy"}} />
+<DButton @class={{this.copyClass}} @icon={{this.copyIcon}} @action={{action "copy"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs b/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
index f7a5927a07a..a4a786f96a6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/count-i18n.hbs
@@ -1 +1 @@
-{{i18nCount}}
+{{this.i18nCount}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
index b6119e5869e..b971bc99170 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-invite-uploader.hbs
@@ -1,6 +1,6 @@
-{{yield (hash data=data
-              uploading=uploading
-              uploadProgress=uploadProgress
-              uploaded=uploaded
-              submitDisabled=submitDisabled
+{{yield (hash data=this.data
+              uploading=this.uploading
+              uploadProgress=this.uploadProgress
+              uploaded=this.uploaded
+              submitDisabled=this.submitDisabled
               startUpload=(action "startUpload"))}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
index da851686378..b4aeebf925c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-topic-button.hbs
@@ -1,3 +1,3 @@
-{{#if canCreateTopic}}
-  <DButton @class={{btnClass}} @id="create-topic" @action={{this.action}} @icon="plus" @disabled={{disabled}} @label={{label}} />
+{{#if this.canCreateTopic}}
+  <DButton @class={{this.btnClass}} @id="create-topic" @action={{this.action}} @icon="plus" @disabled={{this.disabled}} @label={{this.label}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
index fa23799d612..48fad261a72 100644
--- a/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/create-topics-notice.hbs
@@ -1,7 +1,7 @@
-{{#unless hidden}}
+{{#unless this.hidden}}
   <div class="row">
     <div class="alert alert-info alert-too-few-topics">
-      {{message}}
+      {{this.message}}
     </div>
   </div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs b/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
index 81eb3c4f9b0..ce91777a10a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/custom-html-container.hbs
@@ -1 +1 @@
-{{html}}
+{{this.html}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index 552394dd68f..e6586be8dd6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -1,13 +1,13 @@
-{{#if isLoading}}
+{{#if this.isLoading}}
   {{~d-icon "spinner" class="loading-icon"~}}
 {{else}}
-  {{#if icon}}
-    {{~d-icon icon~}}
+  {{#if this.icon}}
+    {{~d-icon this.icon~}}
   {{/if}}
 {{/if}}
 
-{{~#if computedLabel~}}
-  <span class="d-button-label">{{html-safe computedLabel}}{{#if ellipsis}}&hellip;{{/if}}</span>
+{{~#if this.computedLabel~}}
+  <span class="d-button-label">{{html-safe this.computedLabel}}{{#if this.ellipsis}}&hellip;{{/if}}</span>
 {{~else~}}
   &#8203;
   {{! Zero-width space character, so icon-only button height = regular button height }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
index 9b6c0d90c83..eaeffe9f5c3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-editor.hbs
@@ -2,17 +2,17 @@
   <div class="d-editor-textarea-column">
     {{yield}}
 
-    <div class="d-editor-textarea-wrapper {{if disabled "disabled"}} {{if isEditorFocused "in-focus"}}">
+    <div class="d-editor-textarea-wrapper {{if this.disabled "disabled"}} {{if this.isEditorFocused "in-focus"}}">
       <div class="d-editor-button-bar" role="toolbar">
-        {{#each toolbar.groups as |group|}}
+        {{#each this.toolbar.groups as |group|}}
           {{#each group.buttons as |b|}}
             {{#if b.popupMenu}}
-              <ToolbarPopupMenuOptions @content={{popupMenuOptions}} @onChange={{onPopupMenuAction}} @onOpen={{action b.action b}} @class={{b.className}} @tabindex={{-1}} @onKeydown={{rovingButtonBar}} @options={{hash
+              <ToolbarPopupMenuOptions @content={{this.popupMenuOptions}} @onChange={{this.onPopupMenuAction}} @onOpen={{action b.action b}} @class={{b.className}} @tabindex={{-1}} @onKeydown={{this.rovingButtonBar}} @options={{hash
                   icon=b.icon
                   focusAfterOnChange=false
                 }} />
             {{else}}
-              <DButton @action={{b.action}} @type="button" @actionParam={{b}} @translatedTitle={{b.title}} @label={{b.label}} @icon={{b.icon}} @class={{b.className}} @preventFocus={{b.preventFocus}} @tabindex={{b.tabindex}} @onKeyDown={{rovingButtonBar}} />
+              <DButton @action={{b.action}} @type="button" @actionParam={{b}} @translatedTitle={{b.title}} @label={{b.label}} @icon={{b.icon}} @class={{b.className}} @preventFocus={{b.preventFocus}} @tabindex={{b.tabindex}} @onKeyDown={{this.rovingButtonBar}} />
             {{/if}}
           {{/each}}
 
@@ -22,21 +22,21 @@
         {{/each}}
       </div>
 
-      <ConditionalLoadingSpinner @condition={{loading}} />
-      <DTextarea @autocomplete="off" @tabindex={{tabindex}} @value={{value}} @class="d-editor-input" @placeholder={{placeholderTranslated}} @aria-label={{placeholderTranslated}} @disabled={{disabled}} @input={{change}} @focusIn={{action "focusIn"}} @focusOut={{action "focusOut"}} />
-      <PopupInputTip @validation={{validation}} />
-      <PluginOutlet @name="after-d-editor" @connectorTagName="div" @args={{outletArgs}} />
+      <ConditionalLoadingSpinner @condition={{this.loading}} />
+      <DTextarea @autocomplete="off" @tabindex={{this.tabindex}} @value={{this.value}} @class="d-editor-input" @placeholder={{this.placeholderTranslated}} @aria-label={{this.placeholderTranslated}} @disabled={{this.disabled}} @input={{this.change}} @focusIn={{action "focusIn"}} @focusOut={{action "focusOut"}} />
+      <PopupInputTip @validation={{this.validation}} />
+      <PluginOutlet @name="after-d-editor" @connectorTagName="div" @args={{this.outletArgs}} />
     </div>
   </div>
 
-  <div class="d-editor-preview-wrapper {{if forcePreview "force-preview"}}">
+  <div class="d-editor-preview-wrapper {{if this.forcePreview "force-preview"}}">
     <div class="d-editor-preview">
-      {{#unless siteSettings.enable_diffhtml_preview}}
-        {{html-safe preview}}
+      {{#unless this.siteSettings.enable_diffhtml_preview}}
+        {{html-safe this.preview}}
       {{/unless}}
     </div>
-    <PluginOutlet @name="editor-preview" @tagName="span" @connectorTagName="div" @classNames="d-editor-plugin" @args={{outletArgs}} />
+    <PluginOutlet @name="editor-preview" @tagName="span" @connectorTagName="div" @classNames="d-editor-plugin" @args={{this.outletArgs}} />
   </div>
 </div>
 
-<EmojiPicker @isActive={{emojiPickerIsActive}} @isEditorFocused={{isEditorFocused}} @initialFilter={{this.emojiFilter}} @emojiSelected={{action "emojiSelected"}} @onEmojiPickerClose={{onEmojiPickerClose}} />
+<EmojiPicker @isActive={{this.emojiPickerIsActive}} @isEditorFocused={{this.isEditorFocused}} @initialFilter={{this.emojiFilter}} @emojiSelected={{action "emojiSelected"}} @onEmojiPickerClose={{this.onEmojiPickerClose}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
index 1acf461025f..40585044a39 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal-cancel.hbs
@@ -1 +1 @@
-<a href {{action close}} class="d-modal-cancel">{{i18n "cancel"}}</a>
+<a href {{action this.close}} class="d-modal-cancel">{{i18n "cancel"}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
index b0ce07b0c03..0b79bb9f724 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-modal.hbs
@@ -1,25 +1,25 @@
 <div class="modal-outer-container">
   <div class="modal-middle-container">
     <div class="modal-inner-container">
-      <div class="modal-header {{headerClass}}">
-        {{#if dismissable}}
+      <div class="modal-header {{this.headerClass}}">
+        {{#if this.dismissable}}
           <DButton @icon="times" @action={{route-action "closeModal" "initiatedByCloseButton"}} @class="btn-flat modal-close close" @title="modal.close" />
         {{/if}}
 
-        {{#if title}}
+        {{#if this.title}}
           <div class="title">
-            <h3 id="discourse-modal-title">{{title}}</h3>
+            <h3 id="discourse-modal-title">{{this.title}}</h3>
 
-            {{#if subtitle}}
-              <p class="subtitle">{{subtitle}}</p>
+            {{#if this.subtitle}}
+              <p class="subtitle">{{this.subtitle}}</p>
             {{/if}}
           </div>
         {{/if}}
 
-        {{#if panels}}
+        {{#if this.panels}}
           <ul class="modal-tabs">
-            {{#each panels as |panel|}}
-              <ModalTab @panel={{panel}} @panelsLength={{panels.length}} @selectedPanel={{selectedPanel}} @onSelectPanel={{onSelectPanel}} />
+            {{#each this.panels as |panel|}}
+              <ModalTab @panel={{panel}} @panelsLength={{this.panels.length}} @selectedPanel={{this.selectedPanel}} @onSelectPanel={{this.onSelectPanel}} />
             {{/each}}
           </ul>
         {{/if}}
@@ -29,7 +29,7 @@
 
       {{yield}}
 
-      {{#each errors as |error|}}
+      {{#each this.errors as |error|}}
         <div class="alert alert-error">
           <button type="button" class="close" data-dismiss="alert" aria-label={{i18n "modal.dismiss_error"}}>×</button>
           {{error}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
index 9ecb75f9d3f..7c1a0041797 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation-item.hbs
@@ -1,3 +1,3 @@
-<LinkTo @route={{route}}>
+<LinkTo @route={{this.route}}>
   {{yield}}
 </LinkTo>
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
index 781cc61e275..8b7151b7be3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-navigation.hbs
@@ -1,63 +1,63 @@
-<BreadCrumbs @categories={{categories}} @category={{category}} @noSubcategories={{noSubcategories}} @tag={{tag}} @additionalTags={{additionalTags}} />
+<BreadCrumbs @categories={{this.categories}} @category={{this.category}} @noSubcategories={{this.noSubcategories}} @tag={{this.tag}} @additionalTags={{this.additionalTags}} />
 
-{{#unless additionalTags}}
+{{#unless this.additionalTags}}
   {{!-- nav bar doesn't work with tag intersections --}}
-  <NavigationBar @navItems={{navItems}} @filterMode={{filterMode}} @category={{category}} />
+  <NavigationBar @navItems={{this.navItems}} @filterMode={{this.filterMode}} @category={{this.category}} />
 {{/unless}}
 
 <div class="navigation-controls">
 
-  {{#if showCategoryAdmin}}
+  {{#if this.showCategoryAdmin}}
     <CategoriesAdminDropdown @onChange={{action "selectCategoryAdminDropdownAction"}} @options={{hash
         triggerOnChangeOnTab=false
       }} />
   {{/if}}
 
-  {{#if category}}
-    {{#unless tag}}
+  {{#if this.category}}
+    {{#unless this.tag}}
       {{!-- don't show category edit button on tag pages --}}
-      {{#if showCategoryEdit}}
-        <DButton @class="btn-default edit-category" @action={{editCategory}} @icon="wrench" @ariaLabel="category.edit" />
+      {{#if this.showCategoryEdit}}
+        <DButton @class="btn-default edit-category" @action={{this.editCategory}} @icon="wrench" @ariaLabel="category.edit" />
       {{/if}}
     {{/unless}}
   {{/if}}
 
-  {{#if tag}}
-    {{#if showToggleInfo}}
-      <DButton @icon={{if currentUser.staff "wrench" "info-circle"}} @class="btn-default" @ariaLabel="tagging.info" @action={{toggleInfo}} @id="show-tag-info" />
+  {{#if this.tag}}
+    {{#if this.showToggleInfo}}
+      <DButton @icon={{if this.currentUser.staff "wrench" "info-circle"}} @class="btn-default" @ariaLabel="tagging.info" @action={{this.toggleInfo}} @id="show-tag-info" />
     {{/if}}
   {{/if}}
 
   <PluginOutlet @name="before-create-topic-button" @connectorTagName="div" @tagName="" @args={{hash
-      canCreateTopic=canCreateTopic
-      createTopicDisabled=createTopicDisabled
-      createTopicLabel=createTopicLabel
-      additionalTags=additionalTags
-      category=category
-      tag=tag}} />
+      canCreateTopic=this.canCreateTopic
+      createTopicDisabled=this.createTopicDisabled
+      createTopicLabel=this.createTopicLabel
+      additionalTags=this.additionalTags
+      category=this.category
+      tag=this.tag}} />
 
-  <CreateTopicButton @canCreateTopic={{canCreateTopic}} @action={{action "clickCreateTopicButton"}} @disabled={{createTopicButtonDisabled}} @label={{createTopicLabel}} @btnClass={{createTopicClass}} @canCreateTopicOnTag={{canCreateTopicOnTag}} />
+  <CreateTopicButton @canCreateTopic={{this.canCreateTopic}} @action={{action "clickCreateTopicButton"}} @disabled={{this.createTopicButtonDisabled}} @label={{this.createTopicLabel}} @btnClass={{this.createTopicClass}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} />
 
   <PluginOutlet @name="after-create-topic-button" @connectorTagName="div" @tagName="" @args={{hash
-      canCreateTopic=canCreateTopic
-      createTopicDisabled=createTopicDisabled
-      createTopicLabel=createTopicLabel
-      category=category}} />
+      canCreateTopic=this.canCreateTopic
+      createTopicDisabled=this.createTopicDisabled
+      createTopicLabel=this.createTopicLabel
+      category=this.category}} />
 
-  {{#if category}}
-    {{#unless tag}}
+  {{#if this.category}}
+    {{#unless this.tag}}
       {{!-- don't show category notification menu on tag pages --}}
-      {{#if showCategoryNotifications}}
-        <CategoryNotificationsButton @value={{categoryNotificationLevel}} @category={{category}} @onChange={{action "changeCategoryNotificationLevel"}} />
+      {{#if this.showCategoryNotifications}}
+        <CategoryNotificationsButton @value={{this.categoryNotificationLevel}} @category={{this.category}} @onChange={{action "changeCategoryNotificationLevel"}} />
       {{/if}}
     {{/unless}}
   {{/if}}
 
-  {{#if tag}}
-    {{#unless category}}
+  {{#if this.tag}}
+    {{#unless this.category}}
       {{!-- don't show tag notification menu on category pages --}}
-      {{#if showTagNotifications}}
-        <TagNotificationsButton @onChange={{changeTagNotificationLevel}} @value={{tagNotification.notification_level}} />
+      {{#if this.showTagNotifications}}
+        <TagNotificationsButton @onChange={{this.changeTagNotificationLevel}} @value={{this.tagNotification.notification_level}} />
       {{/if}}
     {{/unless}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs b/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs
index 1b5582abab2..20763b2ecaa 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-popover.hbs
@@ -1,4 +1,4 @@
 {{!-- template-lint-disable no-invalid-interactive --}}
-<div {{on "click" (action "close")}} id={{componentId}} class="d-popover {{class}} {{if isExpanded "is-expanded"}}">
-  {{yield (hash isExpanded=isExpanded)}}
+<div {{on "click" (action "close")}} id={{this.componentId}} class="d-popover {{this.class}} {{if this.isExpanded "is-expanded"}}">
+  {{yield (hash isExpanded=this.isExpanded)}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
index 2d13434224b..ac2711b3e34 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-input.hbs
@@ -1,5 +1,5 @@
-<Input @type={{inputType}} class="date-picker" placeholder={{placeholder}} @value={{readonly value}} @input={{action "onChangeDate"}} @id={{inputId}} />
+<Input @type={{this.inputType}} class="date-picker" placeholder={{this.placeholder}} @value={{readonly this.value}} @input={{action "onChangeDate"}} @id={{this.inputId}} />
 
-{{#unless useGlobalPickerContainer}}
+{{#unless this.useGlobalPickerContainer}}
   <div class="picker-container"></div>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
index 0442534ffc6..6e1dade72ec 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-picker.hbs
@@ -1 +1 @@
-<Input @type={{inputType}} class="date-picker" placeholder={{placeholder}} @value={{value}} @autocomplete="off" />
+<Input @type={{this.inputType}} class="date-picker" placeholder={{this.placeholder}} @value={{this.value}} @autocomplete="off" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
index 24900efae56..7135271cbcc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-time-input-range.hbs
@@ -1,3 +1,3 @@
-<DateTimeInput @date={{from}} @onChange={{action "onChangeRanges" (hash prop="from")}} @showTime={{showFromTime}} @class="from" @placeholder={{i18n "dates.from_placeholder"}} />
+<DateTimeInput @date={{this.from}} @onChange={{action "onChangeRanges" (hash prop="from")}} @showTime={{this.showFromTime}} @class="from" @placeholder={{i18n "dates.from_placeholder"}} />
 
-<DateTimeInput @date={{to}} @relativeDate={{from}} @onChange={{action "onChangeRanges" (hash prop="to")}} @timeFirst={{toTimeFirst}} @showTime={{showToTime}} @clearable={{clearable}} @class="to" @placeholder={{i18n "dates.to_placeholder"}} />
+<DateTimeInput @date={{this.to}} @relativeDate={{this.from}} @onChange={{action "onChangeRanges" (hash prop="to")}} @timeFirst={{this.toTimeFirst}} @showTime={{this.showToTime}} @clearable={{this.clearable}} @class="to" @placeholder={{i18n "dates.to_placeholder"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
index cf138cd99ad..1bde658e2f3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/date-time-input.hbs
@@ -1,15 +1,15 @@
-{{#unless timeFirst}}
-  <DateInput @date={{date}} @placeholder={{placeholder}} @relativeDate={{relativeDate}} @onChange={{action "onChangeDate"}} @useGlobalPickerContainer={{useGlobalPickerContainer}} />
+{{#unless this.timeFirst}}
+  <DateInput @date={{this.date}} @placeholder={{this.placeholder}} @relativeDate={{this.relativeDate}} @onChange={{action "onChangeDate"}} @useGlobalPickerContainer={{this.useGlobalPickerContainer}} />
 {{/unless}}
 
-{{#if showTime}}
-  <TimeInput @date={{date}} @relativeDate={{relativeDate}} @onChange={{action "onChangeTime"}} />
+{{#if this.showTime}}
+  <TimeInput @date={{this.date}} @relativeDate={{this.relativeDate}} @onChange={{action "onChangeTime"}} />
 {{/if}}
 
-{{#if timeFirst}}
-  <DateInput @date={{date}} @placeholder={{placeholder}} @relativeDate={{relativeDate}} @onChange={{action "onChangeDate"}} @useGlobalPickerContainer={{useGlobalPickerContainer}} />
+{{#if this.timeFirst}}
+  <DateInput @date={{this.date}} @placeholder={{this.placeholder}} @relativeDate={{this.relativeDate}} @onChange={{action "onChangeDate"}} @useGlobalPickerContainer={{this.useGlobalPickerContainer}} />
 {{/if}}
 
-{{#if clearable}}
+{{#if this.clearable}}
   <DButton @class="btn-default clear-date-time" @icon="times" @action={{action "onClear"}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
index 42add6bbec2..6b861aa0310 100644
--- a/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/desktop-notification-config.hbs
@@ -1,11 +1,11 @@
-{{#if isNotSupported}}
+{{#if this.isNotSupported}}
   <DButton @icon="bell-slash" @class="btn-default" @label="user.desktop_notifications.not_supported" @disabled="true" />
 {{/if}}
-{{#if isDeniedPermission}}
+{{#if this.isDeniedPermission}}
   <DButton @icon="bell-slash" @class="btn-default" @label="user.desktop_notifications.perm_denied_btn" @action={{action "recheckPermission"}} @disabled="true" />
   {{i18n "user.desktop_notifications.perm_denied_expl"}}
 {{else}}
-  {{#if isEnabled}}
+  {{#if this.isEnabled}}
     <DButton @icon="far-bell-slash" @class="btn-default" @label="user.desktop_notifications.disable" @action={{action "turnoff"}} />
   {{else}}
     <DButton @icon="far-bell" @class="btn-default" @label="user.desktop_notifications.enable" @action={{action "turnon"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
index 2e8fdb053d6..062e61c4bc5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/directory-item.hbs
@@ -1,14 +1,14 @@
-<td><UserInfo @user={{item.user}} /></td>
-{{#each columns as |column|}}
+<td><UserInfo @user={{this.item.user}} /></td>
+{{#each this.columns as |column|}}
   <td>
     {{#if (directory-column-is-user-field column=column)}}
-      {{directory-item-user-field-value item=item column=column}}
+      {{directory-item-user-field-value item=this.item column=column}}
     {{else}}
-      {{directory-item-value item=item column=column}}
+      {{directory-item-value item=this.item column=column}}
     {{/if}}
   </td>
 {{/each}}
 
-{{#if showTimeRead}}
-  <td><span class="time-read">{{format-duration item.time_read}}</span></td>
+{{#if this.showTimeRead}}
+  <td><span class="time-read">{{format-duration this.item.time_read}}</span></td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs b/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
index e3a56c286a3..82786f91af0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/directory-table.hbs
@@ -5,18 +5,18 @@
 <div class="directory-table-container">
   <table class="directory-table">
     <thead>
-      <TableHeaderToggle @field="username" @order={{order}} @asc={{asc}} />
-      {{#each columns as |column|}}
-        <TableHeaderToggle @field={{column.name}} @icon={{column.icon}} @order={{order}} @asc={{asc}} @automatic={{directory-column-is-automatic column=column}} @translated={{column.user_field_id}} @onActiveRender={{setActiveHeader}} />
+      <TableHeaderToggle @field="username" @order={{this.order}} @asc={{this.asc}} />
+      {{#each this.columns as |column|}}
+        <TableHeaderToggle @field={{column.name}} @icon={{column.icon}} @order={{this.order}} @asc={{this.asc}} @automatic={{directory-column-is-automatic column=column}} @translated={{column.user_field_id}} @onActiveRender={{this.setActiveHeader}} />
       {{/each}}
 
-      {{#if showTimeRead}}
+      {{#if this.showTimeRead}}
         <th>{{i18n "directory.time_read"}}</th>
       {{/if}}
     </thead>
     <tbody>
-      {{#each items as |item|}}
-        <DirectoryItem @item={{item}} @columns={{columns}} @showTimeRead={{showTimeRead}} />
+      {{#each this.items as |item|}}
+        <DirectoryItem @item={{item}} @columns={{this.columns}} @showTimeRead={{this.showTimeRead}} />
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs b/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
index 0b33962e185..eea2bc9f352 100644
--- a/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/disabled-icon.hbs
@@ -1,5 +1,5 @@
-{{d-icon icon class="fa-stack-1x"}}
+{{d-icon this.icon class="fa-stack-1x"}}
 
-{{#if disabled}}
+{{#if this.disabled}}
   {{d-icon "ban" class="fa-stack-2x"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
index 5280df6b30f..d434b49b430 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discourse-banner.hbs
@@ -1,11 +1,11 @@
-{{#if visible}}
+{{#if this.visible}}
   <div class="row">
-    <div id="banner" class={{overlay}}>
+    <div id="banner" class={{this.overlay}}>
       <div class="floated-buttons">
-        {{#if currentUser.staff}}
-          <a href={{banner.url}} class="btn btn-flat edit-banner">
+        {{#if this.currentUser.staff}}
+          <a href={{this.banner.url}} class="btn btn-flat edit-banner">
             {{d-icon "pencil-alt"}}
-            {{#unless site.mobileView}}
+            {{#unless this.site.mobileView}}
               {{html-safe (i18n "banner.edit")}}
             {{/unless}}
           </a>
@@ -14,7 +14,7 @@
         <DButton @icon="times" @action={{action "dismiss"}} @class="btn btn-flat close" @title="banner.close" />
       </div>
       <div id="banner-content">
-        {{html-safe content}}
+        {{html-safe this.content}}
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
index 78515d04044..e62b3728045 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discourse-linked-text.hbs
@@ -1 +1 @@
-{{html-safe translatedText}}
+{{html-safe this.translatedText}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
index 2285c9ee336..c031fd82d32 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discourse-tag-bound.hbs
@@ -1 +1 @@
-{{tagRecord.id}}
+{{this.tagRecord.id}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
index c1528526e63..0202589651d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/discovery-topics-list.hbs
@@ -1,3 +1,3 @@
 {{yield (hash
-  saveScrollPosition=saveScrollPosition
+  saveScrollPosition=this.saveScrollPosition
 )}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
index 86be4251694..75f35a00551 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-general.hbs
@@ -1,42 +1,42 @@
-{{#if category.isUncategorizedCategory}}
+{{#if this.category.isUncategorizedCategory}}
   <p class="warning">
     {{d-icon "exclamation-triangle"}}
-    {{html-safe (i18n "category.uncategorized_general_warning" settingLink=uncategorizedSiteSettingLink customizeLink=customizeTextContentLink)}}
+    {{html-safe (i18n "category.uncategorized_general_warning" settingLink=this.uncategorizedSiteSettingLink customizeLink=this.customizeTextContentLink)}}
   </p>
 {{/if}}
 
 <form>
-  <CategoryNameFields @category={{category}} @tagName="" />
+  <CategoryNameFields @category={{this.category}} @tagName="" />
 
-  {{#if canSelectParentCategory}}
+  {{#if this.canSelectParentCategory}}
     <section class="field parent-category">
       <label>{{i18n "category.parent"}}</label>
-      <CategoryChooser @value={{category.parent_category_id}} @categories={{parentCategories}} @allowSubCategories={{true}} @allowRestrictedCategories={{true}} @onChange={{action (mut category.parent_category_id)}} @options={{hash
+      <CategoryChooser @value={{this.category.parent_category_id}} @categories={{this.parentCategories}} @allowSubCategories={{true}} @allowRestrictedCategories={{true}} @onChange={{action (mut this.category.parent_category_id)}} @options={{hash
           allowUncategorized=false
-          excludeCategoryId=category.id
+          excludeCategoryId=this.category.id
           none=true
         }} />
     </section>
   {{/if}}
 
-  {{#if subCategories}}
+  {{#if this.subCategories}}
     <section class="field subcategories">
       <label>{{i18n "categories.subcategories"}}</label>
-      {{#each subCategories as |s|}}
+      {{#each this.subCategories as |s|}}
         {{category-badge s hideParent="true"}}
       {{/each}}
     </section>
   {{/if}}
 
-  {{#if showDescription}}
+  {{#if this.showDescription}}
     <section class="field description">
       <label>{{i18n "category.description"}}</label>
-      {{#if category.description}}
-        {{html-safe category.description}}
+      {{#if this.category.description}}
+        {{html-safe this.category.description}}
       {{else}}
         {{i18n "category.no_description"}}
       {{/if}}
-      {{#if category.topic_url}}
+      {{#if this.category.topic_url}}
         <br>
         <DButton @class="btn-default edit-category-description" @action={{action "showCategoryTopic"}} @icon="pencil-alt" @label="category.change_in_category_topic" />
       {{/if}}
@@ -44,7 +44,7 @@
   {{/if}}
 
   <section class="field category-colors">
-    {{#if noCategoryStyle}}
+    {{#if this.noCategoryStyle}}
       <label>
         {{d-icon "exclamation-triangle"}}
         {{i18n "category.colors_disabled"}}
@@ -52,21 +52,21 @@
     {{else}}
       <label>{{i18n "category.badge_colors"}}</label>
       <div class="category-color-editor">
-        {{html-safe categoryBadgePreview}}
+        {{html-safe this.categoryBadgePreview}}
 
         <section class="field">
           <span class="color-title">{{i18n "category.background_color"}}:</span>
           <div class="colorpicker-wrapper">
-            <ColorInput @hexValue={{category.color}} @valid={{category.colorValid}} />
-            <ColorPicker @colors={{backgroundColors}} @usedColors={{usedBackgroundColors}} @value={{category.color}} />
+            <ColorInput @hexValue={{this.category.color}} @valid={{this.category.colorValid}} />
+            <ColorPicker @colors={{this.backgroundColors}} @usedColors={{this.usedBackgroundColors}} @value={{this.category.color}} />
           </div>
         </section>
 
         <section class="field">
           <span class="color-title">{{i18n "category.foreground_color"}}:</span>
           <div class="colorpicker-wrapper edit-text-color">
-            <ColorInput @hexValue={{category.text_color}} />
-            <ColorPicker @colors={{foregroundColors}} @value={{category.text_color}} @id="edit-text-color" />
+            <ColorInput @hexValue={{this.category.text_color}} />
+            <ColorPicker @colors={{this.foregroundColors}} @value={{this.category.text_color}} @id="edit-text-color" />
           </div>
         </section>
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
index 3e16aaca0b9..3f7fcbff36d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-images.hbs
@@ -1,9 +1,9 @@
 <section class="field category-logo">
   <label>{{i18n "category.logo"}}</label>
-  <UppyImageUploader @imageUrl={{logoImageUrl}} @onUploadDone={{action "logoUploadDone"}} @onUploadDeleted={{action "logoUploadDeleted"}} @type="category_logo" @class="no-repeat contain-image" @id="category-logo-uploader" />
+  <UppyImageUploader @imageUrl={{this.logoImageUrl}} @onUploadDone={{action "logoUploadDone"}} @onUploadDeleted={{action "logoUploadDeleted"}} @type="category_logo" @class="no-repeat contain-image" @id="category-logo-uploader" />
 </section>
 
 <section class="field category-background-image">
   <label>{{i18n "category.background_image"}}</label>
-  <UppyImageUploader @imageUrl={{backgroundImageUrl}} @onUploadDone={{action "backgroundUploadDone"}} @onUploadDeleted={{action "backgroundUploadDeleted"}} @type="category_background" @id="category-background-uploader" />
+  <UppyImageUploader @imageUrl={{this.backgroundImageUrl}} @onUploadDone={{action "backgroundUploadDone"}} @onUploadDeleted={{action "backgroundUploadDeleted"}} @type="category_background" @id="category-background-uploader" />
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
index 2fe3ab6dd32..ddd1a25fb23 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-panel.hbs
@@ -1 +1 @@
-{{component customComponent tab=tab selectedTab=selectedTab category=category}}
+{{component this.customComponent tab=this.tab selectedTab=this.selectedTab category=this.category}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
index d0c761cda7e..25038101560 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-security.hbs
@@ -1,13 +1,13 @@
 <section class="field">
-  {{#if category.is_special}}
-    {{#if category.isUncategorizedCategory}}
+  {{#if this.category.is_special}}
+    {{#if this.category.isUncategorizedCategory}}
       <p class="warning">{{i18n "category.uncategorized_security_warning"}}</p>
     {{else}}
       <p class="warning">{{i18n "category.special_warning"}}</p>
     {{/if}}
   {{/if}}
 
-  {{#unless category.is_special}}
+  {{#unless this.category.is_special}}
     <div class="category-permissions-table">
       <div class="permission-row row-header">
         <span class="group-name">{{i18n "category.permissions.group"}}</span>
@@ -17,20 +17,20 @@
           <span class="cell">{{i18n "category.permissions.create"}}</span>
         </span>
       </div>
-      {{#each category.permissions as |p|}}
-        <CategoryPermissionRow @group_name={{p.group_name}} @type={{p.permission_type}} @category={{category}} @everyonePermission={{everyonePermission}} />
+      {{#each this.category.permissions as |p|}}
+        <CategoryPermissionRow @group_name={{p.group_name}} @type={{p.permission_type}} @category={{this.category}} @everyonePermission={{this.everyonePermission}} />
       {{/each}}
 
-      {{#unless category.permissions}}
+      {{#unless this.category.permissions}}
         <div class="permission-row row-empty">
           {{i18n "category.permissions.no_groups_selected"}}
         </div>
       {{/unless}}
 
-      {{#if category.availableGroups}}
+      {{#if this.category.availableGroups}}
         <div class="add-group">
           <span class="group-name">
-            <ComboBox @class="available-groups" @content={{category.availableGroups}} @onChange={{action "onSelectGroup"}} @value={{null}} @valueProperty={{null}} @nameProperty={{null}} @options={{hash
+            <ComboBox @class="available-groups" @content={{this.category.availableGroups}} @onChange={{action "onSelectGroup"}} @value={{null}} @valueProperty={{null}} @nameProperty={{null}} @options={{hash
                 none="category.security_add_group"
               }} />
           </span>
@@ -38,10 +38,10 @@
       {{/if}}
     </div>
 
-    {{#if everyoneGrantedFull}}
+    {{#if this.everyoneGrantedFull}}
       <p class="warning">{{i18n "category.permissions.everyone_has_access"}}</p>
     {{/if}}
   {{/unless}}
 </section>
 
-<PluginOutlet @name="category-custom-security" @args={{hash category=category}} @tagName="section" />
+<PluginOutlet @name="category-custom-security" @args={{hash category=this.category}} @tagName="section" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
index 914209b0608..c8a02c6e56c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-settings.hbs
@@ -1,14 +1,14 @@
 <section>
-  {{#if showPositionInput}}
+  {{#if this.showPositionInput}}
     <section class="field position-fields">
       <label for="category-position">
         {{i18n "category.position"}}
       </label>
-      <TextField @value={{category.position}} @id="category-position" @class="position-input" @type="number" />
+      <TextField @value={{this.category.position}} @id="category-position" @class="position-input" @type="number" />
     </section>
   {{/if}}
 
-  {{#unless showPositionInput}}
+  {{#unless this.showPositionInput}}
     <section class="field position-disabled">
       {{i18n "category.position_disabled"}}
       <a href={{get-url "/admin/site_settings/category/basic"}}>{{i18n "category.position_disabled_click"}}</a>
@@ -17,13 +17,13 @@
 
   <section class="field num-featured-topics">
     <label for="category-number-featured-topics">
-      {{#if category.parent_category_id}}
+      {{#if this.category.parent_category_id}}
         {{i18n "category.subcategory_num_featured_topics"}}
       {{else}}
         {{i18n "category.num_featured_topics"}}
       {{/if}}
     </label>
-    <TextField @value={{category.num_featured_topics}} @id="category-number-featured-topics" @type="number" />
+    <TextField @value={{this.category.num_featured_topics}} @id="category-number-featured-topics" @type="number" />
   </section>
 
   <section class="field search-priority">
@@ -31,26 +31,26 @@
       {{i18n "category.search_priority.label"}}
     </label>
     <div class="controls">
-      <ComboBox @valueProperty="value" @id="category-search-priority" @content={{searchPrioritiesOptions}} @value={{category.search_priority}} @onChange={{action (mut category.search_priority)}} @options={{hash
+      <ComboBox @valueProperty="value" @id="category-search-priority" @content={{this.searchPrioritiesOptions}} @value={{this.category.search_priority}} @onChange={{action (mut this.category.search_priority)}} @options={{hash
           placementStrategy="absolute"
         }} />
     </div>
   </section>
 
-  {{#if siteSettings.enable_badges}}
+  {{#if this.siteSettings.enable_badges}}
     <section class="field allow-badges">
       <label>
-        <Input @type="checkbox" @checked={{category.allow_badges}} />
+        <Input @type="checkbox" @checked={{this.category.allow_badges}} />
         {{i18n "category.allow_badges_label"}}
       </label>
     </section>
   {{/if}}
 
-  {{#if siteSettings.topic_featured_link_enabled}}
+  {{#if this.siteSettings.topic_featured_link_enabled}}
     <section class="field topic-featured-link-allowed">
       <div class="allowed-topic-featured-link-category">
         <label class="checkbox-label">
-          <Input @type="checkbox" @checked={{category.topic_featured_link_allowed}} />
+          <Input @type="checkbox" @checked={{this.category.topic_featured_link_allowed}} />
           {{i18n "category.topic_featured_link_allowed"}}
         </label>
       </div>
@@ -59,21 +59,21 @@
 
   <section class="field navigate-to-first-post-after-read">
     <label>
-      <Input @type="checkbox" @checked={{category.navigate_to_first_post_after_read}} />
+      <Input @type="checkbox" @checked={{this.category.navigate_to_first_post_after_read}} />
       {{i18n "category.navigate_to_first_post_after_read"}}
     </label>
   </section>
 
   <section class="field all-topics-wiki">
     <label>
-      <Input @type="checkbox" @checked={{category.all_topics_wiki}} />
+      <Input @type="checkbox" @checked={{this.category.all_topics_wiki}} />
       {{i18n "category.all_topics_wiki"}}
     </label>
   </section>
 
   <section class="field allow-unlimited-owner-edits-on-first-post">
     <label>
-      <Input @type="checkbox" @checked={{category.allow_unlimited_owner_edits_on_first_post}} />
+      <Input @type="checkbox" @checked={{this.category.allow_unlimited_owner_edits_on_first_post}} />
       {{i18n "category.allow_unlimited_owner_edits_on_first_post"}}
     </label>
   </section>
@@ -81,23 +81,23 @@
 
 <section>
   <h3>{{i18n "category.settings_sections.moderation"}}</h3>
-  {{#if siteSettings.enable_category_group_moderation}}
+  {{#if this.siteSettings.enable_category_group_moderation}}
     <section class="field reviewable-by-group">
       <label>{{i18n "category.reviewable_by_group"}}</label>
-      <GroupSelector @groupFinder={{groupFinder}} @single="true" @groupNames={{category.reviewable_by_group_name}} @placeholderKey="category.review_group_name" />
+      <GroupSelector @groupFinder={{this.groupFinder}} @single="true" @groupNames={{this.category.reviewable_by_group_name}} @placeholderKey="category.review_group_name" />
     </section>
   {{/if}}
 
   <section class="field require-topic-approval">
     <label>
-      <Input @type="checkbox" @checked={{category.custom_fields.require_topic_approval}} />
+      <Input @type="checkbox" @checked={{this.category.custom_fields.require_topic_approval}} />
       {{i18n "category.require_topic_approval"}}
     </label>
   </section>
 
   <section class="field require-reply-approval">
     <label>
-      <Input @type="checkbox" @checked={{category.custom_fields.require_reply_approval}} />
+      <Input @type="checkbox" @checked={{this.category.custom_fields.require_reply_approval}} />
       {{i18n "category.require_reply_approval"}}
     </label>
   </section>
@@ -108,7 +108,7 @@
         {{i18n "category.default_slow_mode"}}
       </label>
       <div class="category-default-slow-mode-seconds">
-        <RelativeTimePicker @id="category-default-slow-mode" @durationMinutes={{category.defaultSlowModeMinutes}} @hiddenIntervals={{hiddenRelativeIntervals}} @onChange={{action "onDefaultSlowModeDurationChange"}} />
+        <RelativeTimePicker @id="category-default-slow-mode" @durationMinutes={{this.category.defaultSlowModeMinutes}} @hiddenIntervals={{this.hiddenRelativeIntervals}} @onChange={{action "onDefaultSlowModeDurationChange"}} />
       </div>
     </div>
   </section>
@@ -119,21 +119,21 @@
         {{i18n "topic.auto_close.label"}}
       </label>
       <div class="category-topic-auto-close-hours">
-        <RelativeTimePicker @id="topic-auto-close" @durationHours={{category.auto_close_hours}} @hiddenIntervals={{hiddenRelativeIntervals}} @onChange={{action "onAutoCloseDurationChange"}} />
+        <RelativeTimePicker @id="topic-auto-close" @durationHours={{this.category.auto_close_hours}} @hiddenIntervals={{this.hiddenRelativeIntervals}} @onChange={{action "onAutoCloseDurationChange"}} />
       </div>
       <label>
-        <Input @type="checkbox" @checked={{category.auto_close_based_on_last_post}} />
+        <Input @type="checkbox" @checked={{this.category.auto_close_based_on_last_post}} />
         {{i18n "topic.auto_close.based_on_last_post"}}
       </label>
     </div>
   </section>
 
-  {{#if siteSettings.tagging_enabled}}
+  {{#if this.siteSettings.tagging_enabled}}
     <section class="field minimum-required-tags">
       <label for="category-minimum-tags">
         {{i18n "category.minimum_required_tags"}}
       </label>
-      <TextField @value={{category.minimum_required_tags}} @id="category-minimum-tags" @type="number" @min="0" />
+      <TextField @value={{this.category.minimum_required_tags}} @id="category-minimum-tags" @type="number" @min="0" />
     </section>
   {{/if}}
 
@@ -141,7 +141,7 @@
     <label for="category-number-daily-bump">
       {{i18n "category.num_auto_bump_daily"}}
     </label>
-    <TextField @value={{category.custom_fields.num_auto_bump_daily}} @id="category-number-daily-bump" @type="number" />
+    <TextField @value={{this.category.custom_fields.num_auto_bump_daily}} @id="category-number-daily-bump" @type="number" />
   </section>
 </section>
 
@@ -153,7 +153,7 @@
       {{i18n "category.default_view"}}
     </label>
     <div class="controls">
-      <ComboBox @valueProperty="value" @id="category-default-view" @content={{availableViews}} @value={{category.default_view}} @options={{hash
+      <ComboBox @valueProperty="value" @id="category-default-view" @content={{this.availableViews}} @value={{this.category.default_view}} @options={{hash
           placementStrategy="absolute"
         }} />
     </div>
@@ -164,7 +164,7 @@
       {{i18n "category.default_top_period"}}
     </label>
     <div class="controls">
-      <ComboBox @valueProperty="value" @id="category-default-period" @content={{availableTopPeriods}} @value={{category.default_top_period}} @options={{hash
+      <ComboBox @valueProperty="value" @id="category-default-period" @content={{this.availableTopPeriods}} @value={{this.category.default_top_period}} @options={{hash
           placementStrategy="absolute"
         }} />
     </div>
@@ -175,14 +175,14 @@
       {{i18n "category.sort_order"}}
     </label>
     <div class="controls">
-      <ComboBox @valueProperty="value" @content={{availableSorts}} @value={{category.sort_order}} @options={{hash
+      <ComboBox @valueProperty="value" @content={{this.availableSorts}} @value={{this.category.sort_order}} @options={{hash
           none="category.sort_options.default"
-        }} @onChange={{action (mut category.sort_order)}} />
-      {{#unless isDefaultSortOrder}}
-        <ComboBox @valueProperty="value" @content={{sortAscendingOptions}} @value={{sortAscendingOption}} @options={{hash
+        }} @onChange={{action (mut this.category.sort_order)}} />
+      {{#unless this.isDefaultSortOrder}}
+        <ComboBox @valueProperty="value" @content={{this.sortAscendingOptions}} @value={{this.sortAscendingOption}} @options={{hash
             none="category.sort_options.default"
             placementStrategy="absolute"
-          }} @onChange={{action (mut category.sort_ascending)}} />
+          }} @onChange={{action (mut this.category.sort_ascending)}} />
       {{/unless}}
     </div>
   </section>
@@ -192,25 +192,25 @@
       {{i18n "category.default_list_filter"}}
     </label>
     <div class="controls">
-      <ComboBox @id="category-default-filter" @valueProperty="value" @content={{availableListFilters}} @value={{category.default_list_filter}} />
+      <ComboBox @id="category-default-filter" @valueProperty="value" @content={{this.availableListFilters}} @value={{this.category.default_list_filter}} />
     </div>
   </section>
 
-  {{#if isParentCategory}}
+  {{#if this.isParentCategory}}
     <section class="field show-subcategory-list-field">
       <label>
-        <Input @type="checkbox" @checked={{category.show_subcategory_list}} />
+        <Input @type="checkbox" @checked={{this.category.show_subcategory_list}} />
         {{i18n "category.show_subcategory_list"}}
       </label>
     </section>
   {{/if}}
 
-  {{#if showSubcategoryListStyle}}
+  {{#if this.showSubcategoryListStyle}}
     <section class="field subcategory-list-style-field">
       <label>
         {{i18n "category.subcategory_list_style"}}
       </label>
-      <ComboBox @valueProperty="value" @id="subcategory-list-style" @content={{availableSubcategoryListStyles}} @value={{category.subcategory_list_style}} @options={{hash
+      <ComboBox @valueProperty="value" @id="subcategory-list-style" @content={{this.availableSubcategoryListStyles}} @value={{this.category.subcategory_list_style}} @options={{hash
           placementStrategy="absolute"
         }} />
     </section>
@@ -218,7 +218,7 @@
 
   <section class="field category-read-only-banner">
     <label for="read-only-message">{{i18n "category.read_only_banner"}}</label>
-    <TextField @valueProperty="value" @id="read-only-message" @value={{category.read_only_banner}} @options={{hash
+    <TextField @valueProperty="value" @id="read-only-message" @value={{this.category.read_only_banner}} @options={{hash
         placementStrategy="absolute"
         }} />
   </section>
@@ -227,33 +227,33 @@
 <section>
   <h3>{{i18n "category.settings_sections.email"}}</h3>
 
-  {{#if emailInEnabled}}
+  {{#if this.emailInEnabled}}
     <section class="field category-email-in">
       <label for="category-email-in">
         {{d-icon "far-envelope"}}
         {{i18n "category.email_in"}}
       </label>
-      <TextField @id="category-email-in" @class="email-in" @value={{category.email_in}} />
+      <TextField @id="category-email-in" @class="email-in" @value={{this.category.email_in}} />
     </section>
 
     <section class="field email-in-allow-strangers">
       <label>
-        <Input @type="checkbox" @checked={{category.email_in_allow_strangers}} />
+        <Input @type="checkbox" @checked={{this.category.email_in_allow_strangers}} />
         {{i18n "category.email_in_allow_strangers"}}
       </label>
     </section>
 
     <section class="field mailinglist-mirror">
       <label>
-        <Input @type="checkbox" @checked={{category.mailinglist_mirror}} />
+        <Input @type="checkbox" @checked={{this.category.mailinglist_mirror}} />
         {{i18n "category.mailinglist_mirror"}}
       </label>
     </section>
 
-    <PluginOutlet @name="category-email-in" @tagName="span" @connectorTagName="div" @args={{hash category=category}} />
+    <PluginOutlet @name="category-email-in" @tagName="span" @connectorTagName="div" @args={{hash category=this.category}} />
   {{/if}}
 
-  {{#unless emailInEnabled}}
+  {{#unless this.emailInEnabled}}
     <section class="field email-in-disabled">
       {{i18n "category.email_in_disabled"}}
       <a href={{get-url "/admin/site_settings/category/email"}}>{{i18n "category.email_in_disabled_click"}}</a>
@@ -261,4 +261,4 @@
   {{/unless}}
 </section>
 
-<PluginOutlet @name="category-custom-settings" @args={{hash category=category}} @tagName="section" />
+<PluginOutlet @name="category-custom-settings" @args={{hash category=this.category}} @tagName="section" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
index 4338f2cb57e..836736abf7b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tab.hbs
@@ -1 +1 @@
-<a href {{action "select"}} class={{if active "active"}}>{{title}}</a>
+<a href {{action "select"}} class={{if this.active "active"}}>{{this.title}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
index 53ff16c71a6..6a0332c666c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-tags.hbs
@@ -1,19 +1,19 @@
 <section class="field allowed-tags">
   <label>{{i18n "category.tags_allowed_tags"}}</label>
-  <TagChooser @id="category-allowed-tags" @tags={{category.allowed_tags}} @everyTag={{true}} @excludeSynonyms={{true}} @unlimitedTagCount={{true}} @onChange={{action (mut category.allowed_tags)}} @options={{hash
+  <TagChooser @id="category-allowed-tags" @tags={{this.category.allowed_tags}} @everyTag={{true}} @excludeSynonyms={{true}} @unlimitedTagCount={{true}} @onChange={{action (mut this.category.allowed_tags)}} @options={{hash
       filterPlaceholder="category.tags_placeholder"
     }} />
 </section>
 
 <section class="field allowed-tag-groups">
   <label>{{i18n "category.tags_allowed_tag_groups"}}</label>
-  <TagGroupChooser @id="category-allowed-tag-groups" @tagGroups={{category.allowed_tag_groups}} @onChange={{action (mut category.allowed_tag_groups)}} />
+  <TagGroupChooser @id="category-allowed-tag-groups" @tagGroups={{this.category.allowed_tag_groups}} @onChange={{action (mut this.category.allowed_tag_groups)}} />
   <LinkTo @route="tagGroups" class="manage-tag-groups">{{i18n "category.manage_tag_groups_link"}}</LinkTo>
 </section>
 
 <section class="field allow-global-tags">
   <label>
-    <Input @type="checkbox" @checked={{category.allow_global_tags}} @id="allow_global_tags" @disabled={{disableAllowGlobalTags}} />
+    <Input @type="checkbox" @checked={{this.category.allow_global_tags}} @id="allow_global_tags" @disabled={{this.disableAllowGlobalTags}} />
     {{i18n "category.allow_global_tags_label"}}
   </label>
 </section>
@@ -28,7 +28,7 @@
 
 <section class="field with-items">
   <section class="field-item required-tag-groups">
-    {{#each category.required_tag_groups as |rtg|}}
+    {{#each this.category.required_tag_groups as |rtg|}}
       <div class="required-tag-group-row">
         <TextField @value={{rtg.min_count}} @type="number" @min="1" />
         <TagGroupChooser @tagGroups={{if rtg.name (array rtg.name) (array )}} @onChange={{action "onTagGroupChange" rtg}} @options={{hash
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
index f3b1e414ef6..9953e35642e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-category-topic-template.hbs
@@ -1 +1 @@
-<DEditor @value={{category.topic_template}} @showLink={{showInsertLinkButton}} />
+<DEditor @value={{this.category.topic_template}} @showLink={{this.showInsertLinkButton}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
index 48d1e020629..7698ebd82b2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/edit-topic-timer-form.hbs
@@ -1,34 +1,34 @@
 <form>
   <div class="control-group">
-    <ComboBox @class="timer-type" @onChange={{onChangeStatusType}} @content={{timerTypes}} @value={{statusType}} />
+    <ComboBox @class="timer-type" @onChange={{this.onChangeStatusType}} @content={{this.timerTypes}} @value={{this.statusType}} />
   </div>
-  {{#if publishToCategory}}
+  {{#if this.publishToCategory}}
     <div class="control-group">
       <label class="control-label">{{i18n "topic.topic_status_update.publish_to"}}</label>
-      <CategoryChooser @value={{topicTimer.category_id}} @onChange={{action (mut topicTimer.category_id)}} @options={{hash
-          excludeCategoryId=excludeCategoryId
+      <CategoryChooser @value={{this.topicTimer.category_id}} @onChange={{action (mut this.topicTimer.category_id)}} @options={{hash
+          excludeCategoryId=this.excludeCategoryId
         }} />
     </div>
   {{/if}}
-  {{#if showFutureDateInput}}
+  {{#if this.showFutureDateInput}}
     <label class="control-label">{{i18n "topic.topic_status_update.when"}}</label>
-    <TimeShortcutPicker @timeShortcuts={{timeOptions}} @prefilledDatetime={{topicTimer.execute_at}} @onTimeSelected={{onTimeSelected}} @hiddenOptions={{hiddenTimeShortcutOptions}} @_itsatrap={{_itsatrap}} />
+    <TimeShortcutPicker @timeShortcuts={{this.timeOptions}} @prefilledDatetime={{this.topicTimer.execute_at}} @onTimeSelected={{this.onTimeSelected}} @hiddenOptions={{this.hiddenTimeShortcutOptions}} @_itsatrap={{this._itsatrap}} />
   {{/if}}
-  {{#if useDuration}}
+  {{#if this.useDuration}}
     <div class="controls">
       <label class="control-label">{{i18n "topic.topic_status_update.duration"}}</label>
-      <RelativeTimePicker @onChange={{action "durationChanged"}} @durationMinutes={{readonly topicTimer.duration_minutes}} />
+      <RelativeTimePicker @onChange={{action "durationChanged"}} @durationMinutes={{readonly this.topicTimer.duration_minutes}} />
     </div>
   {{/if}}
-  {{#if willCloseImmediately}}
+  {{#if this.willCloseImmediately}}
     <div class="warning">
       {{d-icon "exclamation-triangle"}}
-      {{willCloseI18n}}
+      {{this.willCloseI18n}}
     </div>
   {{/if}}
-  {{#if showTopicTimerInfo}}
+  {{#if this.showTopicTimerInfo}}
     <div class="alert alert-info modal-topic-timer-info">
-      <TopicTimerInfo @statusType={{statusType}} @executeAt={{executeAt}} @basedOnLastPost={{topicTimer.based_on_last_post}} @durationMinutes={{topicTimer.duration_minutes}} @categoryId={{topicTimer.category_id}} />
+      <TopicTimerInfo @statusType={{this.statusType}} @executeAt={{this.executeAt}} @basedOnLastPost={{this.topicTimer.based_on_last_post}} @durationMinutes={{this.topicTimer.duration_minutes}} @categoryId={{this.topicTimer.category_id}} />
     </div>
   {{/if}}
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
index 913a37fa8d4..f7e48e39518 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-group-buttons.hbs
@@ -1,30 +1,30 @@
 {{!-- DO NOT EDIT THIS FILE!!! --}}
 {{!-- Update it by running `rake javascript:update_constants` --}}
 
-<button type="button" data-section="smileys_&_emotion" {{action onCategorySelection "smileys_&_emotion"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="smileys_&_emotion" {{action this.onCategorySelection "smileys_&_emotion"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":grinning:"}}
 </button>
-<button type="button" data-section="people_&_body" {{action onCategorySelection "people_&_body"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="people_&_body" {{action this.onCategorySelection "people_&_body"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":wave:"}}
 </button>
-<button type="button" data-section="animals_&_nature" {{action onCategorySelection "animals_&_nature"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="animals_&_nature" {{action this.onCategorySelection "animals_&_nature"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":evergreen_tree:"}}
 </button>
-<button type="button" data-section="food_&_drink" {{action onCategorySelection "food_&_drink"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="food_&_drink" {{action this.onCategorySelection "food_&_drink"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":hamburger:"}}
 </button>
-<button type="button" data-section="travel_&_places" {{action onCategorySelection "travel_&_places"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="travel_&_places" {{action this.onCategorySelection "travel_&_places"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":airplane:"}}
 </button>
-<button type="button" data-section="activities" {{action onCategorySelection "activities"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="activities" {{action this.onCategorySelection "activities"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":soccer:"}}
 </button>
-<button type="button" data-section="objects" {{action onCategorySelection "objects"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="objects" {{action this.onCategorySelection "objects"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":eyeglasses:"}}
 </button>
-<button type="button" data-section="symbols" {{action onCategorySelection "symbols"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="symbols" {{action this.onCategorySelection "symbols"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":white_check_mark:"}}
 </button>
-<button type="button" data-section="flags" {{action onCategorySelection "flags"}} class="btn btn-default category-button emoji">
+<button type="button" data-section="flags" {{action this.onCategorySelection "flags"}} class="btn btn-default category-button emoji">
 	 {{replace-emoji ":checkered_flag:"}}
 </button>
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
index 3611e0b1c37..5af113c6040 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-picker.hbs
@@ -1,9 +1,9 @@
-{{#if isActive}}
+{{#if this.isActive}}
   {{!-- template-lint-disable no-invalid-interactive --}}
   <div {{on "keydown" (action "keydown")}} class="emoji-picker {{if this.isActive "opened"}}">
     {{!-- template-lint-enable no-invalid-interactive --}}
     <div class="emoji-picker-category-buttons">
-      {{#if recentEmojis.length}}
+      {{#if this.recentEmojis.length}}
         <button type="button" data-section="recent" {{action "onCategorySelection" "recent"}} class="btn btn-default category-button emoji">
           {{replace-emoji ":star:"}}
         </button>
@@ -11,7 +11,7 @@
 
       <EmojiGroupButtons @onCategorySelection={{action "onCategorySelection"}} @tagName="" />
 
-      {{#each-in customEmojis as |group emojis|}}
+      {{#each-in this.customEmojis as |group emojis|}}
         <button type="button" data-section={{concat "custom-" group}} {{action "onCategorySelection" (concat "custom-" group)}} class="btn btn-default category-button emoji">
           {{replace-emoji (concat ":" emojis.firstObject.code ":")}}
         </button>
@@ -29,14 +29,14 @@
         <div class="results"></div>
 
         <div class="emojis-container">
-          {{#if recentEmojis.length}}
+          {{#if this.recentEmojis.length}}
             <div class="section recent" data-section="recent">
               <div class="section-header">
                 <span class="title">{{i18n "emoji_picker.recent"}}</span>
                 <DButton @icon="trash-alt" @action={{action "onClearRecents"}} @class="trash-recent" />
               </div>
               <div class="section-group">
-                {{#each recentEmojis as |emoji|}}
+                {{#each this.recentEmojis as |emoji|}}
                   {{replace-emoji (concat ":" emoji ":") (hash lazy=true)}}
                 {{/each}}
               </div>
@@ -45,7 +45,7 @@
 
           <EmojiGroupSections />
 
-          {{#each-in customEmojis as |group emojis|}}
+          {{#each-in this.customEmojis as |group emojis|}}
             <div class="section" data-section="custom-{{group}}">
               <div class="section-header">
                 <span class="title">
@@ -66,13 +66,13 @@
 
       <div class="emoji-picker-footer">
         <div class="emoji-picker-emoji-info">
-          {{#if hoveredEmoji}}
-            {{replace-emoji (concat ":" hoveredEmoji ":")}}
+          {{#if this.hoveredEmoji}}
+            {{replace-emoji (concat ":" this.hoveredEmoji ":")}}
           {{/if}}
         </div>
 
         <div class="emoji-picker-diversity-picker">
-          {{#each diversityScales as |diversityScale index|}}
+          {{#each this.diversityScales as |diversityScale index|}}
             <DButton @icon={{diversityScale.icon}} @class={{concat "diversity-scale " diversityScale.name}} @title={{diversityScale.title}} @action={{action "onDiversitySelection" index}} />
           {{/each}}
         </div>
@@ -80,7 +80,7 @@
     </div>
   </div>
 
-  {{#if site.mobileView}}
+  {{#if this.site.mobileView}}
     <div role="button" class="emoji-picker-modal-overlay" {{on "click" this.onClose}}></div>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
index 954c26229bf..8a599de2470 100644
--- a/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/emoji-uploader.hbs
@@ -4,7 +4,7 @@
       {{i18n "admin.emoji.name"}}
     </span>
     <div class="input">
-      <Input @id="emoji-name" @name="name" @placeholderKey="admin.emoji.name" @value={{readonly name}} @input={{action (mut name) value="target.value"}} />
+      <Input @id="emoji-name" @name="name" @placeholderKey="admin.emoji.name" @value={{readonly this.name}} @input={{action (mut this.name) value="target.value"}} />
     </div>
   </div>
   <div class="control-group">
@@ -12,7 +12,7 @@
       {{i18n "admin.emoji.group"}}
     </span>
     <div class="input">
-      <ComboBox @name="group" @id="emoji-group-selector" @value={{group}} @content={{newEmojiGroups}} @onChange={{action "createEmojiGroup"}} @valueProperty={{null}} @nameProperty={{null}} @options={{hash
+      <ComboBox @name="group" @id="emoji-group-selector" @value={{this.group}} @content={{this.newEmojiGroups}} @onChange={{action "createEmojiGroup"}} @valueProperty={{null}} @nameProperty={{null}} @options={{hash
           allowAny=true
         }} />
     </div>
@@ -21,11 +21,11 @@
     <div class="input">
       <input
         class="hidden-upload-field"
-        disabled={{uploading}}
+        disabled={{this.uploading}}
         type="file"
         multiple="true"
         accept=".png,.gif">
-      <DButton @class="btn-primary" @translatedLabel={{buttonLabel}} @icon="plus" @action={{action "chooseFiles"}} @disabled={{uploading}} />
+      <DButton @class="btn-primary" @translatedLabel={{this.buttonLabel}} @icon="plus" @action={{action "chooseFiles"}} @disabled={{this.uploading}} />
     </div>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs b/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
index ffb1ea66134..79b9709fb0a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/expand-post.hbs
@@ -1,5 +1,5 @@
-{{#if item.truncated}}
-  {{#if expanded}}
+{{#if this.item.truncated}}
+  {{#if this.expanded}}
     <a href class="collapse-item" onclick={{action "toggleItem"}} title={{i18n "post.expand_collapse"}}>
       {{d-icon "chevron-up"}}
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
index c3aa110c1bf..740e2f925b1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/featured-topic.hbs
@@ -1,5 +1,5 @@
-{{raw "topic-status" topic=topic}}
-<a href={{topic.lastUnreadUrl}} class="title">{{html-safe topic.fancyTitle}}</a>
-<TopicPostBadges @unreadPosts={{topic.unread_posts}} @unseen={{topic.unseen}} @url={{topic.lastUnreadUrl}} />
+{{raw "topic-status" topic=this.topic}}
+<a href={{this.topic.lastUnreadUrl}} class="title">{{html-safe this.topic.fancyTitle}}</a>
+<TopicPostBadges @unreadPosts={{this.topic.unread_posts}} @unseen={{this.topic.unseen}} @url={{this.topic.lastUnreadUrl}} />
 
-<a href={{topic.lastPostUrl}} class="last-posted-at">{{format-age topic.last_posted_at}}</a>
+<a href={{this.topic.lastPostUrl}} class="last-posted-at">{{format-age this.topic.last_posted_at}}</a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
index 50299bac97b..196acca2eb2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flag-action-type.hbs
@@ -1,34 +1,32 @@
-{{#if isNotifyUser}}
-  <h3>{{formattedName}}</h3>
+{{#if this.isNotifyUser}}
+  <h3>{{this.formattedName}}</h3>
   <div class="controls">
     <label class="radio">
-      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
 
       <div class="flag-action-type-details">
-        <span class="description">{{html-safe flag.description}}</span>
-        {{#if showMessageInput}}
-          <Textarea @name="message" class="flag-message" placeholder={{customPlaceholder}} @value={{message}} />
-          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        <span class="description">{{html-safe this.flag.description}}</span>
+        {{#if this.showMessageInput}}
+          <Textarea @name="message" class="flag-message" placeholder={{this.customPlaceholder}} @value={{this.message}} />          <div class="custom-message-length {{this.customMessageLengthClasses}}">{{this.customMessageLength}}</div>
         {{/if}}
       </div>
     </label>
   </div>
-  {{#if staffFlagsAvailable}}
+  {{#if this.staffFlagsAvailable}}
     <hr>
     <h3>{{i18n "flagging.notify_staff"}}</h3>
   {{/if}}
 {{else}}
-  <div class="controls {{flag.name_key}}">
+  <div class="controls {{this.flag.name_key}}">
     <label class="radio">
-      <input id="radio_{{flag.name_key}}" {{action "changePostActionType" flag}} type="radio" name="post_action_type_index">
+      <input id="radio_{{this.flag.name_key}}" {{action "changePostActionType" this.flag}} type="radio" name="post_action_type_index">
       <div class="flag-action-type-details">
-        <strong>{{formattedName}}</strong>
-        {{#if showDescription}}
-          <div class="description">{{html-safe description}}</div>
+        <strong>{{this.formattedName}}</strong>
+        {{#if this.showDescription}}
+          <div class="description">{{html-safe this.description}}</div>
         {{/if}}
-        {{#if showMessageInput}}
-          <Textarea @name="message" class="flag-message" placeholder={{customPlaceholder}} @value={{message}} />
-          <div class="custom-message-length {{customMessageLengthClasses}}">{{customMessageLength}}</div>
+        {{#if this.showMessageInput}}
+          <Textarea @name="message" class="flag-message" placeholder={{this.customPlaceholder}} @value={{this.message}} />          <div class="custom-message-length {{this.customMessageLengthClasses}}">{{this.customMessageLength}}</div>
         {{/if}}
       </div>
     </label>
diff --git a/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs b/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
index 86dbbe80936..aa1efc70ca1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flag-selection.hbs
@@ -1,4 +1,4 @@
-{{#each flags as |f|}}
+{{#each this.flags as |f|}}
   {{yield f}}
 {{else}}
   {{i18n "flagging.cant"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs b/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
index 5c8be2b5eab..73981bba089 100644
--- a/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/flat-button.hbs
@@ -1 +1 @@
-{{d-icon icon}}
+{{d-icon this.icon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs b/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
index 03e5c7b8ee2..cf78b9b8f13 100644
--- a/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/footer-message.hbs
@@ -1,5 +1,5 @@
-{{#if education}}<div class="education">{{html-safe education}}</div>{{/if}}
+{{#if this.education}}<div class="education">{{html-safe this.education}}</div>{{/if}}
 <h3>
-  {{message}}
+  {{this.message}}
   {{yield}}
 </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
index 7806581c988..7166ab9e79e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
@@ -1,22 +1,22 @@
 <div class="future-date-input">
   <div class="control-group">
-    <label class={{labelClasses}}>
-      {{#if displayLabelIcon}}{{d-icon displayLabelIcon}}{{/if}}{{displayLabel}}
+    <label class={{this.labelClasses}}>
+      {{#if this.displayLabelIcon}}{{d-icon this.displayLabelIcon}}{{/if}}{{this.displayLabel}}
     </label>
-    <FutureDateInputSelector @value={{readonly selection}} @content={{shortcuts}} @clearable={{clearable}} @onChangeInput={{onChangeInput}} @onChange={{action (mut selection)}} @options={{hash
+    <FutureDateInputSelector @value={{readonly this.selection}} @content={{this.shortcuts}} @clearable={{this.clearable}} @onChangeInput={{this.onChangeInput}} @onChange={{action (mut this.selection)}} @options={{hash
         none="time_shortcut.select_timeframe"
       }} />
   </div>
 
-  {{#if displayDateAndTimePicker}}
+  {{#if this.displayDateAndTimePicker}}
     <div class="control-group future-date-input-date-picker">
       {{d-icon "calendar-alt"}}
-      <DatePickerFuture @value={{_date}} @defaultDate={{_date}} @onSelect={{action "onChangeDate"}} />
+      <DatePickerFuture @value={{this._date}} @defaultDate={{this._date}} @onSelect={{action "onChangeDate"}} />
     </div>
 
     <div class="control-group future-date-input-time-picker">
       {{d-icon "far-clock"}}
-      <Input placeholder="--:--" @type="time" class="time-input" @value={{_time}} @disabled={{timeInputDisabled}} @input={{action "onChangeTime" value="target.value"}} />
+      <Input placeholder="--:--" @type="time" class="time-input" @value={{this._time}} @disabled={{this.timeInputDisabled}} @input={{action "onChangeTime" value="target.value"}} />
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
index cd83a56e3ef..4e984068ca0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/generated-invite-link.hbs
@@ -1,7 +1,7 @@
 <p>{{i18n "user.invited.link_generated"}}</p>
 <p>
-  <input value={{link}} class="invite-link-input" type="text">
+  <input value={{this.link}} class="invite-link-input" type="text">
 </p>
-{{#if email}}
-  <p>{{i18n "user.invited.valid_for" email=email}}</p>
+{{#if this.email}}
+  <p>{{i18n "user.invited.valid_for" email=this.email}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs b/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
index ee2a817fb93..ce0d57a9a86 100644
--- a/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/global-notice.hbs
@@ -1,6 +1,6 @@
 <div class="global-notice">
   {{#if this.visible}}
-    {{#each notices as |notice|}}
+    {{#each this.notices as |notice|}}
       <div class="row">
         <div
           id="global-notice-{{notice.id}}"
diff --git a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
index 5cff891f228..55b40aa42df 100644
--- a/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/google-search.hbs
@@ -1,5 +1,5 @@
 <form action="//google.com/search" id="google-search" class="inline-form">
-  <input type="text" name="q" aria-label={{i18n "search.search_google"}} value={{searchTerm}}>
-  <input name="as_sitesearch" value={{siteUrl}} type="hidden">
+  <input type="text" name="q" aria-label={{i18n "search.search_google"}} value={{this.searchTerm}}>
+  <input name="as_sitesearch" value={{this.siteUrl}} type="hidden">
   <button class="btn btn-primary" type="submit">{{i18n "search.search_google_button"}}</button>
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
index 37d2350117b..fabb1a47baa 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-activity-filter.hbs
@@ -1,3 +1,3 @@
-<LinkTo @route={{concat "group.activity." filter}} @query={{hash category_id=categoryId}}>
-  {{i18n (concat "groups." filter)}}
+<LinkTo @route={{concat "group.activity." this.filter}} @query={{hash category_id=this.categoryId}}>
+  {{i18n (concat "groups." this.filter)}}
 </LinkTo>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
index 7362501fd21..a47f02deca4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-card-contents.hbs
@@ -1,4 +1,4 @@
-{{#if visible}}
+{{#if this.visible}}
   <div class="card-content">
     {{#if this.loading}}
       <div class="card-row first-row">
@@ -13,27 +13,27 @@
     {{else}}
       <div class="card-row first-row">
         <div class="group-card-avatar">
-          <a href={{groupPath}} {{action "showGroup" group}} class="card-huge-avatar">
-            <AvatarFlair @flairName={{group.name}} @flairUrl={{group.flair_url}} @flairBgColor={{group.flair_bg_color}} @flairColor={{group.flair_color}} />
+          <a href={{this.groupPath}} {{action "showGroup" this.group}} class="card-huge-avatar">
+            <AvatarFlair @flairName={{this.group.name}} @flairUrl={{this.group.flair_url}} @flairBgColor={{this.group.flair_bg_color}} @flairColor={{this.group.flair_color}} />
           </a>
         </div>
         <div class="names">
           <span>
-            <h1 class={{group.name}}>
-              <a href={{groupPath}} {{action "showGroup" group}} class="group-page-link">{{group.name}}</a>
+            <h1 class={{this.group.name}}>
+              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="group-page-link">{{this.group.name}}</a>
             </h1>
-            {{#if group.full_name}}
-              <h2 class="full-name">{{group.full_name}}</h2>
+            {{#if this.group.full_name}}
+              <h2 class="full-name">{{this.group.full_name}}</h2>
             {{else}}
-              <h2 class="username">{{group.name}}</h2>
+              <h2 class="username">{{this.group.name}}</h2>
             {{/if}}
           </span>
         </div>
         <ul class="usercard-controls group-details-button">
           <li>
-            <GroupMembershipButton @model={{group}} @showLogin={{route-action "showLogin"}} />
+            <GroupMembershipButton @model={{this.group}} @showLogin={{route-action "showLogin"}} />
           </li>
-          {{#if group.messageable}}
+          {{#if this.group.messageable}}
             <li>
               <DButton @action={{action "messageGroup"}} @class="btn-primary group-message-button inline" @icon="envelope" @label="groups.message" />
             </li>
@@ -49,15 +49,15 @@
         </div>
       {{/if}}
 
-      {{#if group.members}}
+      {{#if this.group.members}}
         <div class="card-row third-row">
           <div class="members metadata">
-            {{#each group.members as |user|}}
+            {{#each this.group.members as |user|}}
               <a {{action "close"}} href={{user.path}} class="card-tiny-avatar">{{bound-avatar user "tiny"}}</a>
             {{/each}}
-            {{#if showMoreMembers}}
-              <a href={{groupPath}} {{action "showGroup" group}} class="more-members-link">
-                <span class="more-members-count">+{{moreMembersCount}} {{i18n "more"}}</span>
+            {{#if this.showMoreMembers}}
+              <a href={{this.groupPath}} {{action "showGroup" this.group}} class="more-members-link">
+                <span class="more-members-count">+{{this.moreMembersCount}} {{i18n "more"}}</span>
               </a>
             {{/if}}
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
index dd7bf91f0b9..a8dc55e628e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-flair-inputs.hbs
@@ -3,20 +3,20 @@
 
   <div class="radios">
     <label class="radio-label" for="avatar-flair-icon">
-      <RadioButton @name="avatar-flair-icon" @id="avatar-flair-icon" @value="icon" @selection={{model.flair_type}} />
+      <RadioButton @name="avatar-flair-icon" @id="avatar-flair-icon" @value="icon" @selection={{this.model.flair_type}} />
       <b>{{i18n "groups.flair_type.icon"}}</b>
     </label>
 
     <label class="radio-label" for="avatar-flair-image">
-      <RadioButton @name="avatar-flair-image" @id="avatar-flair-image" @value="image" @selection={{model.flair_type}} />
+      <RadioButton @name="avatar-flair-image" @id="avatar-flair-image" @value="image" @selection={{this.model.flair_type}} />
       <b>{{i18n "groups.flair_type.image"}}</b>
     </label>
   </div>
 
-  {{#if flairPreviewIcon}}
-    <IconPicker @name="icon" @value={{model.flair_icon}} @options={{hash maximum=1}} @onChange={{action (mut model.flair_icon)}} />
-  {{else if flairPreviewImage}}
-    <UppyImageUploader @imageUrl={{flairImageUrl}} @onUploadDone={{action "setFlairImage"}} @onUploadDeleted={{action "removeFlairImage"}} @type="group_flair" @id="group-flair-uploader" @class="no-repeat contain-image" />
+  {{#if this.flairPreviewIcon}}
+    <IconPicker @name="icon" @value={{this.model.flair_icon}} @options={{hash maximum=1}} @onChange={{action (mut this.model.flair_icon)}} />
+  {{else if this.flairPreviewImage}}
+    <UppyImageUploader @imageUrl={{this.flairImageUrl}} @onUploadDone={{action "setFlairImage"}} @onUploadDeleted={{action "removeFlairImage"}} @type="group_flair" @id="group-flair-uploader" @class="no-repeat contain-image" />
     <div class="control-instructions">
       {{i18n "groups.flair_upload_description"}}
     </div>
@@ -26,27 +26,27 @@
 <div class="control-group">
   <label class="control-label" for="flair_bg_color">{{i18n "groups.flair_bg_color"}}</label>
 
-  <TextField @name="flair_bg_color" @class="group-flair-bg-color input-xxlarge" @value={{model.flair_bg_color}} @placeholderKey="groups.flair_bg_color_placeholder" />
+  <TextField @name="flair_bg_color" @class="group-flair-bg-color input-xxlarge" @value={{this.model.flair_bg_color}} @placeholderKey="groups.flair_bg_color_placeholder" />
 </div>
 
-{{#if flairPreviewIcon}}
+{{#if this.flairPreviewIcon}}
   <div class="control-group">
     <label class="control-label" for="flair_color">{{i18n "groups.flair_color"}}</label>
 
-    <TextField @name="flair_color" @class="group-flair-color input-xxlarge" @value={{model.flair_color}} @placeholderKey="groups.flair_color_placeholder" />
+    <TextField @name="flair_color" @class="group-flair-color input-xxlarge" @value={{this.model.flair_color}} @placeholderKey="groups.flair_color_placeholder" />
   </div>
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label">{{flairPreviewLabel}}</label>
+  <label class="control-label">{{this.flairPreviewLabel}}</label>
 
   <div class="avatar-flair-preview">
     <div class="avatar-wrapper">
-      <img width="45" height="45" src={{demoAvatarUrl}} class="avatar actor" alt="" role="presentation">
+      <img width="45" height="45" src={{this.demoAvatarUrl}} class="avatar actor" alt="" role="presentation">
     </div>
 
-    {{#if (or model.flair_icon flairImageUrl model.flairBackgroundHexColor)}}
-      <AvatarFlair @flairName={{model.name}} @flairUrl={{if flairPreviewIcon model.flair_icon (if flairPreviewImage flairImageUrl "")}} @flairBgColor={{model.flairBackgroundHexColor}} @flairColor={{model.flairHexColor}} />
+    {{#if (or this.model.flair_icon this.flairImageUrl this.model.flairBackgroundHexColor)}}
+      <AvatarFlair @flairName={{this.model.name}} @flairUrl={{if this.flairPreviewIcon this.model.flair_icon (if this.flairPreviewImage this.flairImageUrl "")}} @flairBgColor={{this.model.flairBackgroundHexColor}} @flairColor={{this.model.flairHexColor}} />
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
index 37a71945038..ceb6bca122a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-imap-email-settings.hbs
@@ -3,11 +3,11 @@
     <div>
       <div class="control-group">
         <label for="imap_server">{{i18n "groups.manage.email.credentials.imap_server"}}</label>
-        <Input @type="text" @name="imap_server" @value={{form.imap_server}} @tabindex="8" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="text" @name="imap_server" @value={{this.form.imap_server}} @tabindex="8" @onChange={{action "resetSettingsValid"}} />
       </div>
 
       <label for="enable_ssl_imap">
-        <Input @type="checkbox" @checked={{form.imap_ssl}} @id="enable_ssl_imap" @tabindex="11" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="checkbox" @checked={{this.form.imap_ssl}} @id="enable_ssl_imap" @tabindex="11" @onChange={{action "resetSettingsValid"}} />
         {{i18n "groups.manage.email.credentials.imap_ssl"}}
       </label>
     </div>
@@ -15,15 +15,15 @@
     <div>
       <div class="control-group">
         <label for="imap_port">{{i18n "groups.manage.email.credentials.imap_port"}}</label>
-        <Input @type="text" @name="imap_port" @value={{form.imap_port}} @tabindex="9" @onChange={{action "resetSettingsValid" form.imap_port}} />
+        <Input @type="text" @name="imap_port" @value={{this.form.imap_port}} @tabindex="9" @onChange={{action "resetSettingsValid" this.form.imap_port}} />
       </div>
     </div>
 
     <div>
       <div class="control-group group-imap-mailboxes">
-        {{#if mailboxes}}
+        {{#if this.mailboxes}}
           <label for="imap_mailbox_name">{{i18n "groups.manage.email.mailboxes.synchronized"}}</label>
-          <ComboBox @name="imap_mailbox_name" @id="imap_mailbox" @value={{group.imap_mailbox_name}} @valueProperty="value" @content={{mailboxes}} @tabindex="10" @onChange={{action (mut group.imap_mailbox_name)}} @options={{hash
+          <ComboBox @name="imap_mailbox_name" @id="imap_mailbox" @value={{this.group.imap_mailbox_name}} @valueProperty="value" @content={{this.mailboxes}} @tabindex="10" @onChange={{action (mut this.group.imap_mailbox_name)}} @options={{hash
               none="groups.manage.email.mailboxes.disabled"
             }} />
         {{/if}}
@@ -38,29 +38,29 @@
     </div>
   </div>
 
-  {{#unless mailboxSelected}}
+  {{#unless this.mailboxSelected}}
     <div class="alert alert-error imap-no-mailbox-selected">
       {{i18n "groups.manage.email.imap_mailbox_not_selected"}}
     </div>
   {{/unless}}
 
   <div class="control-group buttons">
-    <DButton @disabled={{or missingSettings testingSettings}} @class="btn-primary test-imap-settings" @action={{action "testImapSettings"}} @icon="cog" @label="groups.manage.email.test_settings" @tabindex="12" @title="groups.manage.email.settings_required" />
+    <DButton @disabled={{or this.missingSettings this.testingSettings}} @class="btn-primary test-imap-settings" @action={{action "testImapSettings"}} @icon="cog" @label="groups.manage.email.test_settings" @tabindex="12" @title="groups.manage.email.settings_required" />
 
-    <ConditionalLoadingSpinner @size="small" @condition={{testingSettings}} />
+    <ConditionalLoadingSpinner @size="small" @condition={{this.testingSettings}} />
 
-    {{#if imapSettingsValid}}
+    {{#if this.imapSettingsValid}}
       <span class="imap-settings-ok">
         {{d-icon "check-circle"}} {{i18n "groups.manage.email.imap_settings_valid"}}
       </span>
     {{/if}}
   </div>
 
-  {{#if group.imap_updated_at}}
+  {{#if this.group.imap_updated_at}}
     <div class="group-email-last-updated-details for-imap">
       <small>
-        {{i18n "groups.manage.email.last_updated"}} <strong>{{format-date group.imap_updated_at leaveAgo="true"}}</strong>
-        {{i18n "groups.manage.email.last_updated_by"}} <LinkTo @route="user" @model={{group.imap_updated_by.username}}>{{group.imap_updated_by.username}}</LinkTo>
+        {{i18n "groups.manage.email.last_updated"}} <strong>{{format-date this.group.imap_updated_at leaveAgo="true"}}</strong>
+        {{i18n "groups.manage.email.last_updated_by"}} <LinkTo @route="user" @model={{this.group.imap_updated_by.username}}>{{this.group.imap_updated_by.username}}</LinkTo>
       </small>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
index da3eb7575b5..a5708079e9a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-email-settings.hbs
@@ -3,15 +3,15 @@
   <p>{{i18n "groups.manage.email.smtp_instructions"}}</p>
 
   <label for="enable_smtp">
-    <Input @type="checkbox" @checked={{group.smtp_enabled}} @id="enable_smtp" @change={{action "smtpEnabledChange"}} @tabindex="1" />
+    <Input @type="checkbox" @checked={{this.group.smtp_enabled}} @id="enable_smtp" @change={{action "smtpEnabledChange"}} @tabindex="1" />
     {{i18n "groups.manage.email.enable_smtp"}}
   </label>
 
-  {{#if group.smtp_enabled}}
-    <GroupSmtpEmailSettings @group={{group}} @smtpSettingsValid={{smtpSettingsValid}} />
+  {{#if this.group.smtp_enabled}}
+    <GroupSmtpEmailSettings @group={{this.group}} @smtpSettingsValid={{this.smtpSettingsValid}} />
   {{/if}}
 
-  {{#if siteSettings.enable_imap}}
+  {{#if this.siteSettings.enable_imap}}
     <div class="group-manage-email-imap-wrapper">
       <br>
 
@@ -23,12 +23,12 @@
       <div class="alert alert-warning">{{i18n "groups.manage.email.imap_alpha_warning"}}</div>
 
       <label for="enable_imap">
-        <Input @type="checkbox" @disabled={{not enableImapSettings}} @checked={{group.imap_enabled}} @id="enable_imap" @change={{action "imapEnabledChange"}} @tabindex="8" />
+        <Input @type="checkbox" @disabled={{not this.enableImapSettings}} @checked={{this.group.imap_enabled}} @id="enable_imap" @change={{action "imapEnabledChange"}} @tabindex="8" />
         {{i18n "groups.manage.email.enable_imap"}}
       </label>
 
-      {{#if group.imap_enabled}}
-        <GroupImapEmailSettings @group={{group}} @imapSettingsValid={{imapSettingsValid}} />
+      {{#if this.group.imap_enabled}}
+        <GroupImapEmailSettings @group={{this.group}} @imapSettingsValid={{this.imapSettingsValid}} />
       {{/if}}
     </div>
   {{/if}}
@@ -37,7 +37,7 @@
     <div class="control-group">
       <h3>{{i18n "groups.manage.email.imap_additional_settings"}}</h3>
       <label class="control-group-inline" for="allow_unknown_sender_topic_replies">
-        <Input @type="checkbox" @name="allow_unknown_sender_topic_replies" @id="allow_unknown_sender_topic_replies" @checked={{group.allow_unknown_sender_topic_replies}} @tabindex="13" />
+        <Input @type="checkbox" @name="allow_unknown_sender_topic_replies" @id="allow_unknown_sender_topic_replies" @checked={{this.group.allow_unknown_sender_topic_replies}} @tabindex="13" />
         <span>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies"}}</span>
       </label>
       <p>{{i18n "groups.manage.email.settings.allow_unknown_sender_topic_replies_hint"}}</p>
@@ -45,5 +45,5 @@
   </div>
 
   <br>
-  <GroupManageSaveButton @model={{group}} @disabled={{not emailSettingsValid}} @beforeSave={{beforeSave}} @afterSave={{afterSave}} @tabindex="15" />
+  <GroupManageSaveButton @model={{this.group}} @disabled={{not this.emailSettingsValid}} @beforeSave={{this.beforeSave}} @afterSave={{this.afterSave}} @tabindex="15" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
index 9a170d76253..f9d4c59a339 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-filter.hbs
@@ -1,3 +1,3 @@
-{{#if value}}
-  <DButton @class="btn-default group-manage-logs-filter" @action={{action "clearFilter"}} @actionParam={{type}} @icon="times-circle" @translatedLabel={{concat label ": " filterText}} />
+{{#if this.value}}
+  <DButton @class="btn-default group-manage-logs-filter" @action={{action "clearFilter"}} @actionParam={{this.type}} @icon="times-circle" @translatedLabel={{concat this.label ": " this.filterText}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
index 10bb4abeedf..b6a843bca42 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-logs-row.hbs
@@ -1,44 +1,44 @@
 <tr class="group-manage-logs-row">
   <td>
-    <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=log.action key="action"}} @translatedLabel={{log.actionTitle}} />
+    <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=this.log.action key="action"}} @translatedLabel={{this.log.actionTitle}} />
   </td>
 
   <td>
-    <span>{{avatar log.acting_user imageSize="tiny"}}</span>
-    <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=log.acting_user.username key="acting_user"}} @translatedLabel={{log.acting_user.username}} />
+    <span>{{avatar this.log.acting_user imageSize="tiny"}}</span>
+    <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=this.log.acting_user.username key="acting_user"}} @translatedLabel={{this.log.acting_user.username}} />
   </td>
 
   <td>
-    {{#if log.target_user}}
-      <span>{{avatar log.target_user imageSize="tiny"}}</span>
-      <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=log.target_user.username key="target_user"}} @translatedLabel={{log.target_user.username}} />
+    {{#if this.log.target_user}}
+      <span>{{avatar this.log.target_user imageSize="tiny"}}</span>
+      <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=this.log.target_user.username key="target_user"}} @translatedLabel={{this.log.target_user.username}} />
     {{/if}}
   </td>
 
   <td>
-    {{#if log.subject}}
-      <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=log.subject key="subject"}} @translatedLabel={{log.subject}} />
+    {{#if this.log.subject}}
+      <DButton @class="btn-default" @action={{action "filter"}} @actionParam={{hash value=this.log.subject key="subject"}} @translatedLabel={{this.log.subject}} />
     {{/if}}
   </td>
 
-  <td>{{bound-date log.created_at}}</td>
+  <td>{{bound-date this.log.created_at}}</td>
 
   <td class="group-manage-logs-expand-details">
-    {{#if log.prev_value}}
-      <DButton @action={{action "toggleDetails"}} @icon={{if expandDetails "angle-up" "angle-down"}} />
+    {{#if this.log.prev_value}}
+      <DButton @action={{action "toggleDetails"}} @icon={{if this.expandDetails "angle-up" "angle-down"}} />
     {{/if}}
   </td>
 </tr>
 
-{{#if expandDetails}}
+{{#if this.expandDetails}}
   <tr>
     <td colspan="6">
       <p>
-        <strong>{{i18n "groups.manage.logs.from"}}</strong>: <code>{{log.prev_value}}</code>
+        <strong>{{i18n "groups.manage.logs.from"}}</strong>: <code>{{this.log.prev_value}}</code>
       </p>
 
       <p>
-        <strong>{{i18n "groups.manage.logs.to"}}</strong>: <code>{{log.new_value}}</code>
+        <strong>{{i18n "groups.manage.logs.to"}}</strong>: <code>{{this.log.new_value}}</code>
       </p>
     </td>
   </tr>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
index 91811e174e5..abbefad39c1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-manage-save-button.hbs
@@ -1,6 +1,6 @@
 <div class="control-group buttons group-manage-save-button">
-  <DButton @action={{action "save"}} @disabled={{or disabled saving}} @class="btn btn-primary group-manage-save" @translatedLabel={{savingText}} />
-  {{#if saved}}
+  <DButton @action={{action "save"}} @disabled={{or this.disabled this.saving}} @class="btn btn-primary group-manage-save" @translatedLabel={{this.savingText}} />
+  {{#if this.saved}}
     <span>{{i18n "saved"}}</span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
index 10da5fb4dfb..78f084e8ff3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-member.hbs
@@ -1,8 +1,8 @@
-<a href={{member.adminPath}}>
-  {{avatar member imageSize="small"}}
+<a href={{this.member.adminPath}}>
+  {{avatar this.member imageSize="small"}}
 </a>
-<span>{{member.username}}</span>
-{{#unless automatic}}
+<span>{{this.member.username}}</span>
+{{#unless this.automatic}}
   <a href {{action "remove"}} class="remove">
     {{d-icon "times"}}
   </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
index de3ca9640b0..16ca860336d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-membership-button.hbs
@@ -1,9 +1,9 @@
-{{#if canJoinGroup}}
-  <DButton @action={{action "joinGroup"}} @class="btn-default group-index-join" @icon="user-plus" @label="groups.join" @disabled={{updatingMembership}} />
-{{else if canLeaveGroup}}
-  <DButton @action={{action "leaveGroup"}} @class="btn-danger group-index-leave" @icon="user-times" @label="groups.leave" @disabled={{updatingMembership}} />
-{{else if canRequestMembership}}
-  <DButton @action={{action "showRequestMembershipForm"}} @class="btn-default group-index-request" @disabled={{loading}} @icon="user-plus" @label="groups.request" />
+{{#if this.canJoinGroup}}
+  <DButton @action={{action "joinGroup"}} @class="btn-default group-index-join" @icon="user-plus" @label="groups.join" @disabled={{this.updatingMembership}} />
+{{else if this.canLeaveGroup}}
+  <DButton @action={{action "leaveGroup"}} @class="btn-danger group-index-leave" @icon="user-times" @label="groups.leave" @disabled={{this.updatingMembership}} />
+{{else if this.canRequestMembership}}
+  <DButton @action={{action "showRequestMembershipForm"}} @class="btn-default group-index-request" @disabled={{this.loading}} @icon="user-plus" @label="groups.request" />
 {{else}}
   {{yield}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
index 79554bfc17a..7292a2f2d07 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-navigation.hbs
@@ -1,5 +1,5 @@
 <MobileNav @class="group-nav" @desktopClass="nav nav-pills">
-  {{#if site.mobileView}}
+  {{#if this.site.mobileView}}
     <li>
       <LinkTo @route="groups.index">
         {{i18n "groups.index.all"}}
@@ -7,18 +7,18 @@
     </li>
   {{else}}
     <li>
-      <GroupDropdown @groups={{group.extras.visible_group_names}} @value={{group.name}} />
+      <GroupDropdown @groups={{this.group.extras.visible_group_names}} @value={{this.group.name}} />
     </li>
   {{/if}}
 
-  {{#each tabs as |tab|}}
+  {{#each this.tabs as |tab|}}
     <li>
-      <LinkTo @route={{tab.route}} @model={{group}} @title={{tab.message}} class={{tab.name}}>
+      <LinkTo @route={{tab.route}} @model={{this.group}} @title={{tab.message}} class={{tab.name}}>
         {{#if tab.icon}}{{d-icon tab.icon}}{{/if}}
         {{tab.message}}
         {{#if tab.count}}<span class="count">({{tab.count}})</span>{{/if}}
       </LinkTo>
     </li>
   {{/each}}
-  <PluginOutlet @name="group-reports-nav-item" @args={{hash group=group}} @connectorTagName="li" />
+  <PluginOutlet @name="group-reports-nav-item" @args={{hash group=this.group}} @connectorTagName="li" />
 </MobileNav>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
index 1677c710167..3a83f4b6770 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-post.hbs
@@ -1,31 +1,31 @@
 <div class="clearfix info">
-  <a href={{post.user.userUrl}} data-user-card={{post.user.username}} class="avatar-link">
-    {{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
+  <a href={{this.post.user.userUrl}} data-user-card={{this.post.user.username}} class="avatar-link">
+    {{avatar this.post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}
   </a>
-  <span class="time">{{format-date post.created_at leaveAgo="true"}}</span>
-  <ExpandPost @item={{post}} />
+  <span class="time">{{format-date this.post.created_at leaveAgo="true"}}</span>
+  <ExpandPost @item={{this.post}} />
 
   <div class="stream-topic-details">
     <div class="stream-topic-title">
       <span class="title">
-        <a href={{postUrl}}>{{html-safe post.topic.fancyTitle}}</a>
+        <a href={{this.postUrl}}>{{html-safe this.post.topic.fancyTitle}}</a>
       </span>
     </div>
-    <div class="group-post-category">{{category-link post.category}}</div>
-    {{#if post.user}}
+    <div class="group-post-category">{{category-link this.post.category}}</div>
+    {{#if this.post.user}}
       <div class="group-member-info names">
-        <span class="name">{{name}}</span>
-        {{#if post.user.title}}<span class="user-title">{{post.user.title}}</span>{{/if}}
-        <PluginOutlet @name="group-post-additional-member-info" @args={{hash user=post.user}} />
+        <span class="name">{{this.name}}</span>
+        {{#if this.post.user.title}}<span class="user-title">{{this.post.user.title}}</span>{{/if}}
+        <PluginOutlet @name="group-post-additional-member-info" @args={{hash user=this.post.user}} />
       </div>
     {{/if}}
   </div>
 </div>
 
 <div class="excerpt">
-  {{#if post.expandedExcerpt}}
-    {{html-safe post.expandedExcerpt}}
+  {{#if this.post.expandedExcerpt}}
+    {{html-safe this.post.expandedExcerpt}}
   {{else}}
-    {{html-safe post.excerpt}}
+    {{html-safe this.post.excerpt}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
index 0ceb9144ce5..96ddd481501 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-selector.hbs
@@ -1 +1 @@
-<input placeholder={{placeholder}} class="group-selector" type="text" name="groups">
+<input placeholder={{this.placeholder}} class="group-selector" type="text" name="groups">
diff --git a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
index 973ad8a3384..8c3bde59399 100644
--- a/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/group-smtp-email-settings.hbs
@@ -3,16 +3,16 @@
     <div>
       <div class="control-group">
         <label for="username">{{i18n "groups.manage.email.credentials.username"}}</label>
-        <Input @type="text" @name="username" @value={{form.email_username}} @tabindex="1" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="text" @name="username" @value={{this.form.email_username}} @tabindex="1" @onChange={{action "resetSettingsValid"}} />
       </div>
 
       <div class="control-group">
         <label for="smtp_server">{{i18n "groups.manage.email.credentials.smtp_server"}}</label>
-        <Input @type="text" @name="smtp_server" @value={{form.smtp_server}} @tabindex="4" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="text" @name="smtp_server" @value={{this.form.smtp_server}} @tabindex="4" @onChange={{action "resetSettingsValid"}} />
       </div>
 
       <label for="enable_ssl">
-        <Input @type="checkbox" @checked={{form.smtp_ssl}} @id="enable_ssl" @tabindex="6" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="checkbox" @checked={{this.form.smtp_ssl}} @id="enable_ssl" @tabindex="6" @onChange={{action "resetSettingsValid"}} />
         {{i18n "groups.manage.email.credentials.smtp_ssl"}}
       </label>
     </div>
@@ -20,19 +20,19 @@
     <div>
       <div class="control-group">
         <label for="password">{{i18n "groups.manage.email.credentials.password"}}</label>
-        <Input @type="password" @name="password" @value={{form.email_password}} @tabindex="2" @onChange={{action "resetSettingsValid"}} />
+        <Input @type="password" @name="password" @value={{this.form.email_password}} @tabindex="2" @onChange={{action "resetSettingsValid"}} />
       </div>
 
       <div class="control-group">
         <label for="smtp_port">{{i18n "groups.manage.email.credentials.smtp_port"}}</label>
-        <Input @type="text" @name="smtp_port" @value={{form.smtp_port}} @tabindex="5" @onChange={{action "resetSettingsValid" form.smtp_port}} />
+        <Input @type="text" @name="smtp_port" @value={{this.form.smtp_port}} @tabindex="5" @onChange={{action "resetSettingsValid" this.form.smtp_port}} />
       </div>
     </div>
 
     <div>
       <div class="control-group">
         <label for="from_alias">{{i18n "groups.manage.email.settings.from_alias"}}</label>
-        <Input @type="text" @name="from_alias" @id="from_alias" @value={{form.email_from_alias}} @onChange={{action "resetSettingsValid"}} @tabindex="3" />
+        <Input @type="text" @name="from_alias" @id="from_alias" @value={{this.form.email_from_alias}} @onChange={{action "resetSettingsValid"}} @tabindex="3" />
         <p>{{i18n "groups.manage.email.settings.from_alias_hint"}}</p>
       </div>
     </div>
@@ -45,22 +45,22 @@
   </div>
 
   <div class="control-group buttons">
-    <DButton @disabled={{or missingSettings testingSettings}} @class="btn-primary test-smtp-settings" @action={{action "testSmtpSettings"}} @icon="cog" @label="groups.manage.email.test_settings" @tabindex="7" @title="groups.manage.email.settings_required" />
+    <DButton @disabled={{or this.missingSettings this.testingSettings}} @class="btn-primary test-smtp-settings" @action={{action "testSmtpSettings"}} @icon="cog" @label="groups.manage.email.test_settings" @tabindex="7" @title="groups.manage.email.settings_required" />
 
-    <ConditionalLoadingSpinner @size="small" @condition={{testingSettings}} />
+    <ConditionalLoadingSpinner @size="small" @condition={{this.testingSettings}} />
 
-    {{#if smtpSettingsValid}}
+    {{#if this.smtpSettingsValid}}
       <span class="smtp-settings-ok">
         {{d-icon "check-circle"}} {{i18n "groups.manage.email.smtp_settings_valid"}}
       </span>
     {{/if}}
   </div>
 
-  {{#if group.smtp_updated_at}}
+  {{#if this.group.smtp_updated_at}}
     <div class="group-email-last-updated-details for-smtp">
       <small>
-        {{i18n "groups.manage.email.last_updated"}} <strong>{{format-date group.smtp_updated_at leaveAgo="true"}}</strong>
-        {{i18n "groups.manage.email.last_updated_by"}} <LinkTo @route="user" @model={{group.smtp_updated_by.username}}>{{group.smtp_updated_by.username}}</LinkTo>
+        {{i18n "groups.manage.email.last_updated"}} <strong>{{format-date this.group.smtp_updated_at leaveAgo="true"}}</strong>
+        {{i18n "groups.manage.email.last_updated_by"}} <LinkTo @route="user" @model={{this.group.smtp_updated_by.username}}>{{this.group.smtp_updated_by.username}}</LinkTo>
       </small>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
index 714141bbb12..38c2126dece 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-interaction-fields.hbs
@@ -1,9 +1,9 @@
-{{#if canAdminGroup}}
+{{#if this.canAdminGroup}}
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.interaction.visibility"}}</label>
     <label for="visiblity">{{i18n "admin.groups.manage.interaction.visibility_levels.title"}}</label>
 
-    <ComboBox @name="alias" @valueProperty="value" @value={{model.visibility_level}} @content={{visibilityLevelOptions}} @class="groups-form-visibility-level" @onChange={{action (mut model.visibility_level)}} @options={{hash
+    <ComboBox @name="alias" @valueProperty="value" @value={{this.model.visibility_level}} @content={{this.visibilityLevelOptions}} @class="groups-form-visibility-level" @onChange={{action (mut this.model.visibility_level)}} @options={{hash
         castInteger=true
       }} />
 
@@ -15,9 +15,9 @@
   <div class="control-group">
     <label for="visiblity">{{i18n "admin.groups.manage.interaction.members_visibility_levels.title"}}</label>
 
-    <ComboBox @name="alias" @valueProperty="value" @value={{membersVisibilityLevel}} @content={{visibilityLevelOptions}} @class="groups-form-members-visibility-level" @onChange={{action (mut model.members_visibility_level)}} />
+    <ComboBox @name="alias" @valueProperty="value" @value={{this.membersVisibilityLevel}} @content={{this.visibilityLevelOptions}} @class="groups-form-members-visibility-level" @onChange={{action (mut this.model.members_visibility_level)}} />
 
-    {{#if membersVisibilityPrivate}}
+    {{#if this.membersVisibilityPrivate}}
       <div class="control-instructions">
         {{i18n "admin.groups.manage.interaction.members_visibility_levels.description"}}
       </div>
@@ -29,33 +29,33 @@
   <label class="control-label">{{i18n "groups.manage.interaction.posting"}}</label>
   <label for="alias">{{i18n "groups.alias_levels.mentionable"}}</label>
 
-  <ComboBox @name="alias" @valueProperty="value" @value={{mentionableLevel}} @content={{aliasLevelOptions}} @class="groups-form-mentionable-level" @onChange={{action (mut model.mentionable_level)}} />
+  <ComboBox @name="alias" @valueProperty="value" @value={{this.mentionableLevel}} @content={{this.aliasLevelOptions}} @class="groups-form-mentionable-level" @onChange={{action (mut this.model.mentionable_level)}} />
 </div>
 
 <div class="control-group">
   <label for="alias">{{i18n "groups.alias_levels.messageable"}}</label>
 
-  <ComboBox @name="alias" @valueProperty="value" @value={{messageableLevel}} @content={{aliasLevelOptions}} @class="groups-form-messageable-level" @onChange={{action (mut model.messageable_level)}} />
+  <ComboBox @name="alias" @valueProperty="value" @value={{this.messageableLevel}} @content={{this.aliasLevelOptions}} @class="groups-form-messageable-level" @onChange={{action (mut this.model.messageable_level)}} />
 </div>
 
-{{#if canAdminGroup}}
+{{#if this.canAdminGroup}}
   <div class="control-group">
     <label>
-      <Input @type="checkbox" @checked={{model.publish_read_state}} class="groups-form-publish-read-state" />
+      <Input @type="checkbox" @checked={{this.model.publish_read_state}} class="groups-form-publish-read-state" />
 
       {{i18n "admin.groups.manage.interaction.publish_read_state"}}
     </label>
   </div>
 {{/if}}
 
-{{#if showEmailSettings}}
+{{#if this.showEmailSettings}}
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.interaction.email"}}</label>
     <label for="incoming_email">{{i18n "admin.groups.manage.interaction.incoming_email"}}</label>
 
-    <TextField @name="incoming_email" @class="input-xxlarge groups-form-incoming-email" @value={{model.incoming_email}} @placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder" />
+    <TextField @name="incoming_email" @class="input-xxlarge groups-form-incoming-email" @value={{this.model.incoming_email}} @placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder" />
 
-    <PluginOutlet @name="group-email-in" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+    <PluginOutlet @name="group-email-in" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
   </div>
 {{/if}}
 
@@ -64,9 +64,9 @@
 <div class="control-group">
   <label>{{i18n "groups.notification_level"}}</label>
 
-  <NotificationsButton @value={{defaultNotificationLevel}} @class="groups-form-default-notification-level" @options={{hash
+  <NotificationsButton @value={{this.defaultNotificationLevel}} @class="groups-form-default-notification-level" @options={{hash
       i18nPrefix="groups.notifications"
-    }} @onChange={{action (mut model.default_notification_level)}} />
+    }} @onChange={{action (mut this.model.default_notification_level)}} />
 </div>
 
-<PluginOutlet @name="groups-interaction-custom-options" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="groups-interaction-custom-options" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
index c64741ae1a3..7a5b66ed9ce 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-membership-fields.hbs
@@ -2,35 +2,35 @@
   <label class="control-label">{{i18n "groups.manage.membership.access"}}</label>
 
   <label>
-    <Input @type="checkbox" class="group-form-public-admission" @checked={{model.public_admission}} @disabled={{disablePublicSetting}} />
+    <Input @type="checkbox" class="group-form-public-admission" @checked={{this.model.public_admission}} @disabled={{this.disablePublicSetting}} />
 
     {{i18n "groups.public_admission"}}
   </label>
 
   <label>
-    <Input @type="checkbox" class="group-form-public-exit" @checked={{model.public_exit}} />
+    <Input @type="checkbox" class="group-form-public-exit" @checked={{this.model.public_exit}} />
 
     {{i18n "groups.public_exit"}}
   </label>
 
   <label>
-    <Input @type="checkbox" class="group-form-allow-membership-requests" @checked={{model.allow_membership_requests}} @disabled={{disableMembershipRequestSetting}} />
+    <Input @type="checkbox" class="group-form-allow-membership-requests" @checked={{this.model.allow_membership_requests}} @disabled={{this.disableMembershipRequestSetting}} />
 
     {{i18n "groups.allow_membership_requests"}}
   </label>
 
-  {{#if model.allow_membership_requests}}
+  {{#if this.model.allow_membership_requests}}
     <div>
       <label for="membership-request-template">
         {{i18n "groups.membership_request_template"}}
       </label>
 
-      <ExpandingTextArea @name="membership-request-template" @class="group-form-membership-request-template input-xxlarge" @value={{model.membership_request_template}} />
+      <ExpandingTextArea @name="membership-request-template" @class="group-form-membership-request-template input-xxlarge" @value={{this.model.membership_request_template}} />
     </div>
   {{/if}}
 </div>
 
-{{#if model.can_admin_group}}
+{{#if this.model.can_admin_group}}
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.membership.automatic"}}</label>
 
@@ -38,26 +38,26 @@
       {{i18n "admin.groups.manage.membership.automatic_membership_email_domains"}}
     </label>
 
-    <ListSetting @name="automatic_membership" @class="group-form-automatic-membership-automatic" @value={{emailDomains}} @choices={{emailDomains}} @settingName="name" @nameProperty={{null}} @valueProperty={{null}} @onChange={{action "onChangeEmailDomainsSetting"}} @options={{hash allowAny=true}} />
+    <ListSetting @name="automatic_membership" @class="group-form-automatic-membership-automatic" @value={{this.emailDomains}} @choices={{this.emailDomains}} @settingName="name" @nameProperty={{null}} @valueProperty={{null}} @onChange={{action "onChangeEmailDomainsSetting"}} @options={{hash allowAny=true}} />
 
-    {{#if showAssociatedGroups}}
+    {{#if this.showAssociatedGroups}}
       <label for="automatic_membership_associated_groups">
         {{i18n "admin.groups.manage.membership.automatic_membership_associated_groups"}}
       </label>
 
-      <ListSetting @name="automatic_membership_associated_groups" @class="group-form-automatic-membership-associated-groups" @value={{model.associatedGroupIds}} @choices={{associatedGroups}} @settingName="name" @nameProperty="label" @valueProperty="id" @onChange={{action (mut model.associated_group_ids)}} />
+      <ListSetting @name="automatic_membership_associated_groups" @class="group-form-automatic-membership-associated-groups" @value={{this.model.associatedGroupIds}} @choices={{this.associatedGroups}} @settingName="name" @nameProperty="label" @valueProperty="id" @onChange={{action (mut this.model.associated_group_ids)}} />
     {{/if}}
   </div>
 
-  <PluginOutlet @name="groups-form-membership-below-automatic" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+  <PluginOutlet @name="groups-form-membership-below-automatic" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
   <div class="control-group">
     <label class="control-label">{{i18n "admin.groups.manage.membership.effects"}}</label>
     <label for="grant_trust_level">{{i18n "admin.groups.manage.membership.trust_levels_title"}}</label>
 
-    <ComboBox @name="grant_trust_level" @valueProperty="value" @value={{groupTrustLevel}} @content={{trustLevelOptions}} @class="groups-form-grant-trust-level" @onChange={{action (mut model.grant_trust_level)}} />
+    <ComboBox @name="grant_trust_level" @valueProperty="value" @value={{this.groupTrustLevel}} @content={{this.trustLevelOptions}} @class="groups-form-grant-trust-level" @onChange={{action (mut this.model.grant_trust_level)}} />
     <label>
-      <Input @type="checkbox" @checked={{model.primary_group}} class="groups-form-primary-group" />
+      <Input @type="checkbox" @checked={{this.model.primary_group}} class="groups-form-primary-group" />
 
       {{i18n "admin.groups.manage.membership.primary_group"}}
     </label>
@@ -68,7 +68,7 @@
       {{i18n "admin.groups.default_title"}}
     </label>
 
-    <Input @value={{model.title}} @name="title" class="input-xxlarge" />
+    <Input @value={{this.model.title}} @name="title" class="input-xxlarge" />
 
     <div class="control-instructions">
       {{i18n "admin.groups.default_title_description"}}
@@ -76,8 +76,8 @@
   </div>
 {{/if}}
 
-{{#if canEdit}}
+{{#if this.canEdit}}
   <div class="control-group">
-    <GroupFlairInputs @model={{model}} />
+    <GroupFlairInputs @model={{this.model}} />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
index 92cca84c253..1148f3e3702 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-form-profile-fields.hbs
@@ -1,34 +1,34 @@
-{{#if canEdit}}
+{{#if this.canEdit}}
   {{#if this.currentUser.can_create_group}}
     <div class="control-group">
       <label class="control-label" for="name">{{i18n "groups.name"}}</label>
 
-      <TextField @name="name" @class="input-xxlarge group-form-name" @value={{nameInput}} @placeholderKey="admin.groups.name_placeholder" />
+      <TextField @name="name" @class="input-xxlarge group-form-name" @value={{this.nameInput}} @placeholderKey="admin.groups.name_placeholder" />
 
-      <InputTip @validation={{nameValidation}} />
+      <InputTip @validation={{this.nameValidation}} />
     </div>
   {{/if}}
 
   <div class="control-group">
     <label class="control-label" for="full_name">{{i18n "groups.manage.full_name"}}</label>
 
-    <TextField @name="full_name" @class="input-xxlarge group-form-full-name" @value={{model.full_name}} />
+    <TextField @name="full_name" @class="input-xxlarge group-form-full-name" @value={{this.model.full_name}} />
   </div>
 {{/if}}
 
 <div class="control-group">
   <label class="control-label" for="bio">{{i18n "groups.bio"}}</label>
-  <DEditor @value={{model.bio_raw}} @class="group-form-bio input-xxlarge" />
+  <DEditor @value={{this.model.bio_raw}} @class="group-form-bio input-xxlarge" />
 </div>
 
-{{#if model.automatic}}
+{{#if this.model.automatic}}
   <div class="control-group">
-    <GroupFlairInputs @model={{model}} />
+    <GroupFlairInputs @model={{this.model}} />
   </div>
 {{/if}}
 
-{{#if canEdit}}
+{{#if this.canEdit}}
   {{yield}}
 
-  <PluginOutlet @name="group-edit" @tagName="span" @connectorTagName="div" @args={{hash group=model}} />
+  <PluginOutlet @name="group-edit" @tagName="span" @connectorTagName="div" @args={{hash group=this.model}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs b/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
index a82509be40f..3de74fcb484 100644
--- a/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/groups-info.hbs
@@ -1,5 +1,5 @@
-{{#if showFullName}}
-  <span class="groups-info-name">{{group.full_name}}</span>
+{{#if this.showFullName}}
+  <span class="groups-info-name">{{this.group.full_name}}</span>
 {{else}}
-  <span class="groups-info-name">{{group.displayName}}</span>
+  <span class="groups-info-name">{{this.group.displayName}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs b/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
index 02ed8af4802..15e474ef692 100644
--- a/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/hidden-details.hbs
@@ -1,6 +1,6 @@
-{{#unless expanded}}
-  <DButton @action={{action "expand"}} @class="btn-link" @label={{label}} />
+{{#unless this.expanded}}
+  <DButton @action={{action "expand"}} @class="btn-link" @label={{this.label}} />
 {{/unless}}
-{{#if expanded}}
-  <span class="description" aria-live="assertive">{{details}}</span>
+{{#if this.expanded}}
+  <span class="description" aria-live="assertive">{{this.details}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
index c079068765d..6f6d0134a6a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list-item.hbs
@@ -1,4 +1,4 @@
 <div class="ignored-user-list-item">
-  <span class="ignored-user-name">{{item}}</span>
-  <DButton @class="remove-ignored-user no-text btn-icon" @action={{action "removeIgnoredUser" item}} @icon="times" />
+  <span class="ignored-user-name">{{this.item}}</span>
+  <DButton @class="remove-ignored-user no-text btn-icon" @action={{action "removeIgnoredUser" this.item}} @icon="times" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
index d8f9eeec0f9..c2e19d3e635 100644
--- a/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/ignored-user-list.hbs
@@ -1,5 +1,5 @@
 <div class="ignored-list">
-  {{#each items as |item|}}
+  {{#each this.items as |item|}}
     <IgnoredUserListItem @item={{item}} @onRemoveIgnoredUser={{action "removeIgnoredUser"}} />
   {{else}}
     {{i18n "user.user_notifications.ignore_no_users"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
index 0795ff8ed0b..9ff305cbc9f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/images-uploader.hbs
@@ -1,7 +1,7 @@
-<label class="btn" disabled={{uploadingOrProcessing}} title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>
-  {{d-icon "far-image"}}&nbsp;{{uploadButtonText}}
-  <input class="hidden-upload-field" disabled={{uploading}} type="file" accept="image/*" multiple>
+<label class="btn" disabled={{this.uploadingOrProcessing}} title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>
+  {{d-icon "far-image"}}&nbsp;{{this.uploadButtonText}}
+  <input class="hidden-upload-field" disabled={{this.uploading}} type="file" accept="image/*" multiple>
 </label>
-{{#if uploadingOrProcessing}}
-  <span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
+{{#if this.uploadingOrProcessing}}
+  <span>{{i18n "upload_selector.uploading"}} {{this.uploadProgress}}%</span>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
index 60c2336dfcb..a31bfcea00d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/input-tip.hbs
@@ -1,3 +1,3 @@
-{{#if tipReason}}
-  {{tipIcon}} {{tipReason}}
+{{#if this.tipReason}}
+  {{this.tipIcon}} {{this.tipReason}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
index 934e8adc94e..a238167a369 100644
--- a/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/invite-panel.hbs
@@ -1,62 +1,62 @@
-{{#if inviteModel.error}}
+{{#if this.inviteModel.error}}
   <div class="alert alert-error">
-    {{html-safe errorMessage}}
+    {{html-safe this.errorMessage}}
   </div>
 {{/if}}
 
 <div class="body">
-  {{#if inviteModel.finished}}
-    {{#if inviteModel.inviteLink}}
-      <GeneratedInviteLink @link={{inviteModel.inviteLink}} @email={{invitee}} />
+  {{#if this.inviteModel.finished}}
+    {{#if this.inviteModel.inviteLink}}
+      <GeneratedInviteLink @link={{this.inviteModel.inviteLink}} @email={{this.invitee}} />
     {{else}}
       <div class="success-message">
-        {{html-safe successMessage}}
+        {{html-safe this.successMessage}}
       </div>
     {{/if}}
   {{else}}
     <div class="invite-user-control">
-      <label class="instructions">{{inviteInstructions}}</label>
+      <label class="instructions">{{this.inviteInstructions}}</label>
       <div class="invite-user-input-wrapper">
-        {{#if allowExistingMembers}}
-          <EmailGroupUserChooser @class="invite-user-input" @value={{invitee}} @onChange={{action "updateInvitee"}} @options={{hash
+        {{#if this.allowExistingMembers}}
+          <EmailGroupUserChooser @class="invite-user-input" @value={{this.invitee}} @onChange={{action "updateInvitee"}} @options={{hash
               maximum=1
-              allowEmails=canInviteViaEmail
+              allowEmails=this.canInviteViaEmail
               excludeCurrentUser=true
-              includeMessageableGroups=isPM
-              filterPlaceholder=placeholderKey
+              includeMessageableGroups=this.isPM
+              filterPlaceholder=this.placeholderKey
               fullWidthWrap=true
             }} />
         {{else}}
-          <TextField @class="email-or-username-input" @value={{invitee}} @placeholderKey="topic.invite_reply.email_placeholder" />
+          <TextField @class="email-or-username-input" @value={{this.invitee}} @placeholderKey="topic.invite_reply.email_placeholder" />
         {{/if}}
-        {{#if capabilities.hasContactPicker}}
+        {{#if this.capabilities.hasContactPicker}}
           <DButton @icon="address-book" @action={{action "searchContact"}} @class="btn-primary open-contact-picker" />
         {{/if}}
       </div>
     </div>
 
-    {{#if showGroups}}
+    {{#if this.showGroups}}
       <div class="group-access-control">
-        <label class="instructions {{showGroupsClass}}">
+        <label class="instructions {{this.showGroupsClass}}">
           {{i18n "topic.automatically_add_to_groups"}}
         </label>
-        <GroupChooser @content={{allGroups}} @value={{groupIds}} @labelProperty="name" @onChange={{action (mut groupIds)}} />
+        <GroupChooser @content={{this.allGroups}} @value={{this.groupIds}} @labelProperty="name" @onChange={{action (mut this.groupIds)}} />
       </div>
     {{/if}}
 
-    {{#if showCustomMessage}}
+    {{#if this.showCustomMessage}}
       <div class="show-custom-message-control">
         <label class="instructions">
           <DiscourseLinkedText @class="optional" @action={{action "showCustomMessageBox"}} @text="invite.custom_message" />
         </label>
-        {{#if hasCustomMessage}}
-          <Textarea @value={{customMessage}} placeholder={{customMessagePlaceholder}} />
+        {{#if this.hasCustomMessage}}
+          <Textarea @value={{this.customMessage}} placeholder={{this.customMessagePlaceholder}} />
         {{/if}}
       </div>
     {{/if}}
   {{/if}}
 
-  {{#if showApprovalMessage}}
+  {{#if this.showApprovalMessage}}
     <label class="instructions approval-notice">
       {{i18n "invite.approval_not_required"}}
     </label>
@@ -64,12 +64,12 @@
 </div>
 
 <div class="footer">
-  {{#if inviteModel.finished}}
+  {{#if this.inviteModel.finished}}
     <DButton @class="btn-primary" @action={{action "sendCloseModal"}} @label="close" />
   {{else}}
-    <DButton @icon={{inviteIcon}} @action={{action "createInvite"}} @class="btn-primary send-invite" @disabled={{disabled}} @label={{buttonTitle}} />
-    {{#if showCopyInviteButton}}
-      <DButton @icon="link" @action={{action "generateInviteLink"}} @class="btn-primary generate-invite-link" @disabled={{disabledCopyLink}} @label="user.invited.generate_link" />
+    <DButton @icon={{this.inviteIcon}} @action={{action "createInvite"}} @class="btn-primary send-invite" @disabled={{this.disabled}} @label={{this.buttonTitle}} />
+    {{#if this.showCopyInviteButton}}
+      <DButton @icon="link" @action={{action "generateInviteLink"}} @class="btn-primary generate-invite-link" @disabled={{this.disabledCopyLink}} @label="user.invited.generate_link" />
     {{/if}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
index f1afb4a7985..3279507fd0f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/json-editor.hbs
@@ -1,4 +1,4 @@
-<DModalBody @rawTitle={{i18n "admin.site_settings.json_schema.modal_title" name=settingName}}>
+<DModalBody @rawTitle={{i18n "admin.site_settings.json_schema.modal_title" name=this.settingName}}>
   <div id="json-editor-holder"></div>
 </DModalBody>
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
index b35d945c277..936685d2e42 100644
--- a/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/latest-topic-list-item.hbs
@@ -1,26 +1,26 @@
 <PluginOutlet @name="above-latest-topic-list-item" @connectorTagName="div" />
 <div class="topic-poster">
-  <UserLink @user={{topic.lastPosterUser}}>
-    {{avatar topic.lastPosterUser imageSize="large"}}
+  <UserLink @user={{this.topic.lastPosterUser}}>
+    {{avatar this.topic.lastPosterUser imageSize="large"}}
   </UserLink>
-  <UserAvatarFlair @user={{topic.lastPosterUser}} />
+  <UserAvatarFlair @user={{this.topic.lastPosterUser}} />
 </div>
 <div class="main-link">
   <div class="top-row">
-    {{raw "topic-status" topic=topic}}
-    {{topic-link topic}}
-    {{~#if topic.featured_link}}
-      {{topic-featured-link topic}}
+    {{raw "topic-status" topic=this.topic}}
+    {{topic-link this.topic}}
+    {{~#if this.topic.featured_link}}
+      {{topic-featured-link this.topic}}
     {{/if}}
-    <TopicPostBadges @unreadPosts={{topic.unread_posts}} @unseen={{topic.unseen}} @url={{topic.lastUnreadUrl}} />
+    <TopicPostBadges @unreadPosts={{this.topic.unread_posts}} @unseen={{this.topic.unseen}} @url={{this.topic.lastUnreadUrl}} />
   </div>
   <div class="bottom-row">
-    {{category-link topic.category}}{{discourse-tags topic mode="list"}}{{! intentionally inline to avoid whitespace}}
+    {{category-link this.topic.category}}{{discourse-tags this.topic mode="list"}}{{! intentionally inline to avoid whitespace}}
   </div>
 </div>
 <div class="topic-stats">
-  {{raw "list/posts-count-column" topic=topic tagName="div"}}
+  {{raw "list/posts-count-column" topic=this.topic tagName="div"}}
   <div class="topic-last-activity">
-    <a href={{topic.lastPostUrl}} title={{topic.bumpedAtTitle}}>{{format-date topic.bumpedAt format="tiny" noTitle="true"}}</a>
+    <a href={{this.topic.lastPostUrl}} title={{this.topic.bumpedAtTitle}}>{{format-date this.topic.bumpedAt format="tiny" noTitle="true"}}</a>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs b/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
index 29b892df7fc..7c4f104e2bb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/link-to-input.hbs
@@ -1,12 +1,12 @@
-{{#if showInput}}
+{{#if this.showInput}}
   {{yield}}
 {{else}}
   <a href>
-    {{#if key}}
-      {{i18n key}}
+    {{#if this.key}}
+      {{i18n this.key}}
     {{/if}}
-    {{#if icon}}
-      {{d-icon icon}}
+    {{#if this.icon}}
+      {{d-icon this.icon}}
     {{/if}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
index f334a041090..f4eec15a1c1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/login-buttons.hbs
@@ -1,5 +1,5 @@
-{{#each buttons as |b|}}
-  <button type="button" class="btn btn-social {{b.name}}" {{action externalLogin b}} aria-label={{b.screenReaderTitle}} tabindex="3">
+{{#each this.buttons as |b|}}
+  <button type="button" class="btn btn-social {{b.name}}" {{action this.externalLogin b}} aria-label={{b.screenReaderTitle}} tabindex="3">
     {{#if b.isGoogle}}
       <svg class="fa d-icon d-icon-custom-google-oauth2 svg-icon" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>
     {{else if b.icon}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
index 1f1fc1ec803..f3350cf9dc5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/mobile-category-topic.hbs
@@ -1,11 +1,11 @@
 <td class="main-link">
   <div class="topic-inset">
-    {{raw "topic-status" topic=topic}}
-    {{topic-link topic}}
-    {{#if topic.unseen}}
+    {{raw "topic-status" topic=this.topic}}
+    {{topic-link this.topic}}
+    {{#if this.topic.unseen}}
       <span class="badge-notification new-topic"></span>
     {{/if}}
-    <span class={{cold-age-class topic.last_posted_at}} title={{raw-date topic.last_posted_at}}>{{format-age topic.last_posted_at}}</span>
+    <span class={{cold-age-class this.topic.last_posted_at}} title={{raw-date this.topic.last_posted_at}}>{{format-age this.topic.last_posted_at}}</span>
   </div>
 </td>
-<td class="num posts">{{raw "list/post-count-or-badges" topic=topic postBadgesEnabled="true"}}</td>
+<td class="num posts">{{raw "list/post-count-or-badges" topic=this.topic postBadgesEnabled="true"}}</td>
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
index 52c0d9abda5..3ffc479da02 100644
--- a/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/modal-panel.hbs
@@ -1 +1 @@
-{{component panelComponent panel=panel close=(route-action "closeModal")}}
+{{component this.panelComponent panel=this.panel close=(route-action "closeModal")}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs b/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
index ab17eedc049..4c8bee551ff 100644
--- a/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/modal-tab.hbs
@@ -1 +1 @@
-{{title}}
+{{this.title}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
index 94e64a4c483..551f2531f92 100644
--- a/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/nav-item.hbs
@@ -1,7 +1,7 @@
-{{#if routeParam}}
-  <LinkTo @route={{route}} @model={{routeParam}}>{{contents}}</LinkTo>
-{{else if route}}
-  <LinkTo @route={{route}}>{{contents}}</LinkTo>
+{{#if this.routeParam}}
+  <LinkTo @route={{this.route}} @model={{this.routeParam}}>{{this.contents}}</LinkTo>
+{{else if this.route}}
+  <LinkTo @route={{this.route}}>{{this.contents}}</LinkTo>
 {{else}}
-  <a href={{get-url path}} data-auto-route="true">{{contents}}</a>
+  <a href={{get-url this.path}} data-auto-route="true">{{this.contents}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
index 0b811f7f919..f11865b78b4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/navigation-bar.hbs
@@ -1,5 +1,5 @@
-{{#each navItems as |navItem|}}
-  <NavigationItem @content={{navItem}} @filterMode={{filterMode}} @category={{category}} @class={{concat "nav-item_" navItem.name}} />
+{{#each this.navItems as |navItem|}}
+  <NavigationItem @content={{navItem}} @filterMode={{this.filterMode}} @category={{this.category}} @class={{concat "nav-item_" navItem.name}} />
 {{/each}}
 <CustomHtml @name="extraNavItem" @tagName="li" />
-<PluginOutlet @name="extra-nav-item" @connectorTagName="li" @args={{hash category=category filterMode=filterMode}} />
+<PluginOutlet @name="extra-nav-item" @connectorTagName="li" @args={{hash category=this.category filterMode=this.filterMode}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs b/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
index 7cd996da0cd..621b7cf94b5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/navigation-item.hbs
@@ -1,6 +1,6 @@
-<a href={{hrefLink}} class={{activeClass}}>
-  {{#if hasIcon}}
-    <span class={{content.name}}></span>
+<a href={{this.hrefLink}} class={{this.activeClass}}>
+  {{#if this.hasIcon}}
+    <span class={{this.content.name}}></span>
   {{/if}}
-  {{content.displayName}}
+  {{this.content.displayName}}
 </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
index 3f21ef3536c..b5e84a3c056 100644
--- a/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/notification-consent-banner.hbs
@@ -1,4 +1,4 @@
-{{#if showNotificationPromptBanner}}
+{{#if this.showNotificationPromptBanner}}
   <div class="row">
     <div class="consent_banner alert alert-info">
       <span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
index e86156382b9..3e5c77a1022 100644
--- a/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/parent-category-row.hbs
@@ -1,43 +1,43 @@
-{{#unless isHidden}}
-  <PluginOutlet @name="category-list-above-each-category" @args={{hash category=category}} />
+{{#unless this.isHidden}}
+  <PluginOutlet @name="category-list-above-each-category" @args={{hash category=this.category}} />
 
-  <tr data-category-id={{category.id}} data-notification-level={{category.notificationLevelString}} class="{{if category.description_excerpt "has-description" "no-description"}} {{if category.uploaded_logo.url "has-logo" "no-logo"}}">
-    <td class="category {{if isMuted "muted"}} {{if noCategoryStyle "no-category-style"}}" style={{unless noCategoryStyle (html-safe (concat (border-color category.color) (category-color-variable category.color)))}}>
-      <CategoryTitleLink @category={{category}} />
-      <PluginOutlet @name="below-category-title-link" @connectorTagName="div" @args={{hash category=category}} />
+  <tr data-category-id={{this.category.id}} data-notification-level={{this.category.notificationLevelString}} class="{{if this.category.description_excerpt "has-description" "no-description"}} {{if this.category.uploaded_logo.url "has-logo" "no-logo"}}">
+    <td class="category {{if this.isMuted "muted"}} {{if this.noCategoryStyle "no-category-style"}}" style={{unless this.noCategoryStyle (html-safe (concat (border-color this.category.color) (category-color-variable this.category.color)))}}>
+      <CategoryTitleLink @category={{this.category}} />
+      <PluginOutlet @name="below-category-title-link" @connectorTagName="div" @args={{hash category=this.category}} />
 
-      {{#if category.description_excerpt}}
+      {{#if this.category.description_excerpt}}
         <div class="category-description">
-          {{dir-span category.description_excerpt htmlSafe="true"}}
+          {{dir-span this.category.description_excerpt htmlSafe="true"}}
         </div>
       {{/if}}
 
-      {{#if category.isGrandParent}}
+      {{#if this.category.isGrandParent}}
         <table class="category-list subcategories-with-subcategories">
           <tbody>
-            {{#each category.subcategories as |subcategory|}}
-              <SubCategoryRow @category={{subcategory}} @listType={{listType}} />
+            {{#each this.category.subcategories as |subcategory|}}
+              <SubCategoryRow @category={{subcategory}} @listType={{this.listType}} />
             {{/each}}
           </tbody>
         </table>
-      {{else if category.subcategories}}
+      {{else if this.category.subcategories}}
         <div class="subcategories">
-          {{#each category.subcategories as |subcategory|}}
-            <SubCategoryItem @category={{subcategory}} @listType={{listType}} />
+          {{#each this.category.subcategories as |subcategory|}}
+            <SubCategoryItem @category={{subcategory}} @listType={{this.listType}} />
           {{/each}}
         </div>
       {{/if}}
     </td>
 
     <td class="topics">
-      <div title={{category.statTitle}}>{{html-safe category.stat}}</div>
-      <CategoryUnread @category={{category}} @tagName="div" @class="unread-new" />
+      <div title={{this.category.statTitle}}>{{html-safe this.category.stat}}</div>
+      <CategoryUnread @category={{this.category}} @tagName="div" @class="unread-new" />
     </td>
 
-    {{#unless isMuted}}
-      {{#if showTopics}}
+    {{#unless this.isMuted}}
+      {{#if this.showTopics}}
         <td class="latest">
-          {{#each category.featuredTopics as |t|}}
+          {{#each this.category.featuredTopics as |t|}}
             <FeaturedTopic @topic={{t}} />
           {{/each}}
         </td>
diff --git a/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs b/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
index a35f7174c64..0b20c066beb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/pick-files-button.hbs
@@ -1,8 +1,8 @@
-{{#if showButton}}
-  <DButton @action={{action "openSystemFilePicker"}} @label={{label}} @icon={{icon}} />
+{{#if this.showButton}}
+  <DButton @action={{action "openSystemFilePicker"}} @label={{this.label}} @icon={{this.icon}} />
 {{/if}}
-{{#if acceptsAllFormats}}
-  <input type="file" id={{fileInputId}} class={{fileInputClass}} multiple={{allowMultiple}} disabled={{fileInputDisabled}}>
+{{#if this.acceptsAllFormats}}
+  <input type="file" id={{this.fileInputId}} class={{this.fileInputClass}} multiple={{this.allowMultiple}} disabled={{this.fileInputDisabled}}>
 {{else}}
-  <input type="file" id={{fileInputId}} class={{fileInputClass}} accept={{acceptedFormats}} multiple={{allowMultiple}} disabled={{fileInputDisabled}}>
+  <input type="file" id={{this.fileInputId}} class={{this.fileInputClass}} accept={{this.acceptedFormats}} multiple={{this.allowMultiple}} disabled={{this.fileInputDisabled}}>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs b/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
index 4f6c319f549..2d084c7674d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/plugin-outlet.hbs
@@ -1,3 +1,3 @@
-{{#each connectors as |c|}}
-  <PluginConnector @connector={{c}} @args={{args}} @deprecatedArgs={{deprecatedArgs}} @class={{c.classNames}} @tagName={{connectorTagName}} />
+{{#each this.connectors as |c|}}
+  <PluginConnector @connector={{c}} @args={{this.args}} @deprecatedArgs={{this.deprecatedArgs}} @class={{c.classNames}} @tagName={{this.connectorTagName}} />
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
index 6ac65b42ac2..3b3cf33c2ca 100644
--- a/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/popup-input-tip.hbs
@@ -1 +1 @@
-{{tipReason}} {{d-icon "times-circle"}}
+{{this.tipReason}} {{d-icon "times-circle"}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs b/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
index 5c5c8a9ed2e..e607369b914 100644
--- a/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/popup-menu.hbs
@@ -1,4 +1,4 @@
-<h3>{{i18n title}}</h3>
+<h3>{{i18n this.title}}</h3>
 <ul>
   {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs b/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
index 3a84ea4b8a2..08258295920 100644
--- a/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/preference-checkbox.hbs
@@ -1,4 +1,4 @@
 <label class="checkbox-label">
-  <Input @type="checkbox" @disabled={{disabled}} @checked={{checked}} />
-  {{label}}
+  <Input @type="checkbox" @disabled={{this.disabled}} @checked={{this.checked}} />
+  {{this.label}}
 </label>
diff --git a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
index e8e9ea8f7bc..b783e9082ab 100644
--- a/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/private-message-glyph.hbs
@@ -1,6 +1,6 @@
-{{#if shouldShow}}
-  {{#if href}}
-    <a href={{href}} title={{i18n title}} aria-label={{i18n ariaLabel}}>
+{{#if this.shouldShow}}
+  {{#if this.href}}
+    <a href={{this.href}} title={{i18n this.title}} aria-label={{i18n this.ariaLabel}}>
       <span class="private-message-glyph-wrapper">
         {{d-icon "envelope" class="private-message-glyph"}}
       </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
index 7ead7e3df9b..990fe59ac8d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs
@@ -1,8 +1,8 @@
-{{#if showPWAInstallBanner}}
+{{#if this.showPWAInstallBanner}}
   <div class="row">
     <div class="pwa-install-banner alert alert-info">
       <span>
-        <DiscourseLinkedText @action={{action "turnOn"}} @text="pwa.install_banner" @textParams={{hash title=siteSettings.title}} />
+        <DiscourseLinkedText @action={{action "turnOn"}} @text="pwa.install_banner" @textParams={{hash title=this.siteSettings.title}} />
       </span>
       <DButton @icon="times" @action={{action "dismiss"}} @class="btn btn-flat close" @title="banner.close" />
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs b/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
index 9966b9a58c0..38ad2d919fb 100644
--- a/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/quote-button.hbs
@@ -1,22 +1,22 @@
 <div class="buttons">
-  {{#if embedQuoteButton}}
+  {{#if this.embedQuoteButton}}
     <DButton @class="btn-flat insert-quote" @action={{action "insertQuote"}} @icon="quote-left" @label="post.quote_reply" @title="post.quote_reply_shortcut" />
   {{/if}}
 
-  {{#if siteSettings.enable_fast_edit}}
-    {{#if _canEditPost}}
+  {{#if this.siteSettings.enable_fast_edit}}
+    {{#if this._canEditPost}}
       <DButton @icon="pencil-alt" @action={{action "_toggleFastEditForm"}} @label="post.quote_edit" @class="btn-flat quote-edit-label" @title="post.quote_edit_shortcut" />
     {{/if}}
   {{/if}}
 
-  {{#if quoteSharingEnabled}}
+  {{#if this.quoteSharingEnabled}}
     <span class="quote-sharing">
-      {{#if quoteSharingShowLabel}}
+      {{#if this.quoteSharingShowLabel}}
         <DButton @icon="share" @label="post.quote_share" @class="btn-flat quote-share-label" />
       {{/if}}
 
       <span class="quote-share-buttons">
-        {{#each quoteSharingSources as |source|}}
+        {{#each this.quoteSharingSources as |source|}}
           <DButton @class="btn-flat" @action={{action "share" source}} @translatedTitle={{source.title}} @icon={{source.icon}} />
         {{/each}}
         <PluginOutlet @name="quote-share-buttons-after" @connectorTagName="div" />
@@ -26,11 +26,10 @@
 </div>
 
 <div class="extra">
-  {{#if siteSettings.enable_fast_edit}}
-    {{#if _displayFastEditInput}}
+  {{#if this.siteSettings.enable_fast_edit}}
+    {{#if this._displayFastEditInput}}
       <div class="fast-edit-container">
-        <Textarea @id="fast-edit-input" @value={{_fastEditNewSelection}} />
-        <DButton @action={{action "_saveFastEdit"}} @class="btn-small btn-primary save-fast-edit" @icon="pencil-alt" @label="composer.save_edit" @translatedTitle={{_saveEditButtonTitle}} @disabled={{_saveFastEditDisabled}} @isLoading={{_isSavingFastEdit}} />
+        <Textarea @id="fast-edit-input" @value={{this._fastEditNewSelection}} />        <DButton @action={{action "_saveFastEdit"}} @class="btn-small btn-primary save-fast-edit" @icon="pencil-alt" @label="composer.save_edit" @translatedTitle={{this._saveEditButtonTitle}} @disabled={{this._saveFastEditDisabled}} @isLoading={{this._isSavingFastEdit}} />
       </div>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs b/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
index cc6b4f40859..c6b003cf462 100644
--- a/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/related-messages.hbs
@@ -4,16 +4,16 @@
   </h3>
 
   <div class="topics">
-    <BasicTopicList @hideCategory="true" @showPosters="true" @topics={{topic.relatedMessages}} />
+    <BasicTopicList @hideCategory="true" @showPosters="true" @topics={{this.topic.relatedMessages}} />
   </div>
 
-  {{#if targetUser}}
+  {{#if this.targetUser}}
     <h3 class="see-all-pms-message">
       {{html-safe
         (i18n
           "related_messages.see_all"
-          path=searchLink
-          username=targetUser.username
+          path=this.searchLink
+          username=this.targetUser.username
         )
       }}
     </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
index 2fc133aefd3..61b217c293a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/relative-time-picker.hbs
@@ -1,4 +1,4 @@
 <div class="relative-time-picker">
-  <Input class="relative-time-duration" @min={{durationMin}} @step={{durationStep}} @type="number" @value={{duration}} @onChange={{action "onChangeDuration"}} @id={{id}} />
-  <ComboBox @content={{intervals}} @value={{selectedInterval}} @class="relative-time-intervals" @onChange={{action "onChangeInterval"}} />
+  <Input class="relative-time-duration" @min={{this.durationMin}} @step={{this.durationStep}} @type="number" @value={{this.duration}} @onChange={{action "onChangeDuration"}} @id={{this.id}} />
+  <ComboBox @content={{this.intervals}} @value={{this.selectedInterval}} @class="relative-time-intervals" @onChange={{action "onChangeInterval"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
index 740d1ea63df..34d5780f73e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-bundled-action.hbs
@@ -1,10 +1,10 @@
-{{#if multiple}}
-  <DropdownSelectBox @class="reviewable-action-dropdown" @nameProperty="label" @content={{bundle.actions}} @onChange={{action "performById"}} @options={{hash
-      icon=bundle.icon
-      disabled=reviewableUpdating
-      placement=placement
-      translatedNone=bundle.label
+{{#if this.multiple}}
+  <DropdownSelectBox @class="reviewable-action-dropdown" @nameProperty="label" @content={{this.bundle.actions}} @onChange={{action "performById"}} @options={{hash
+      icon=this.bundle.icon
+      disabled=this.reviewableUpdating
+      placement=this.placement
+      translatedNone=this.bundle.label
     }} />
 {{else}}
-  <DButton @class={{concat "reviewable-action " (dasherize first.id) " " first.button_class}} @icon={{first.icon}} @action={{action "perform" first}} @translatedLabel={{first.label}} @disabled={{reviewableUpdating}} />
+  <DButton @class={{concat "reviewable-action " (dasherize this.first.id) " " this.first.button_class}} @icon={{this.first.icon}} @action={{action "perform" this.first}} @translatedLabel={{this.first.label}} @disabled={{this.reviewableUpdating}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
index 2d14dda38ed..7c1e1d336d3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-claimed-topic.hbs
@@ -1,11 +1,11 @@
-{{#if enabled}}
+{{#if this.enabled}}
   <div class="reviewable-claimed-topic">
-    {{#if claimedBy}}
+    {{#if this.claimedBy}}
       <div class="claimed-by">
-        {{avatar claimedBy imageSize="small"}}
-        <span class="claimed-username">{{claimedBy.username}}</span>
+        {{avatar this.claimedBy imageSize="small"}}
+        <span class="claimed-username">{{this.claimedBy.username}}</span>
       </div>
-      <DButton @icon="times" @class="btn-small unclaim" @action={{action "unclaim"}} @disabled={{unassigning}} @title="review.unclaim.help" />
+      <DButton @icon="times" @class="btn-small unclaim" @action={{action "unclaim"}} @disabled={{this.unassigning}} @title="review.unclaim.help" />
     {{else}}
       <DButton @icon="user-plus" @class="btn-small claim" @title="review.claim.title" @action={{action "claim"}} />
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
index 87bdc7fb1b3..da288d2823c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-conversation-post.hbs
@@ -1,8 +1,8 @@
-{{#if post}}
+{{#if this.post}}
   <div class="reviewable-conversation-post">
-    {{#if showUsername}}
-      <LinkTo @route="user" @model={{post.user}} class="username">@{{post.user.username}}</LinkTo>
+    {{#if this.showUsername}}
+      <LinkTo @route="user" @model={{this.post.user}} class="username">@{{this.post.user.username}}</LinkTo>
     {{/if}}
-    {{html-safe post.excerpt}}
+    {{html-safe this.post.excerpt}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
index e7e6ade724b..93e23de43b8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by-name.hbs
@@ -1,13 +1,13 @@
 <div class="names">
   <span class="username">
-    {{#if user}}
-      <UserLink @user={{user}}>{{user.username}}</UserLink>
-      {{#if user.silenced}}
+    {{#if this.user}}
+      <UserLink @user={{this.user}}>{{this.user.username}}</UserLink>
+      {{#if this.user.silenced}}
         {{d-icon "ban" title="user.silenced_tooltip"}}
       {{/if}}
     {{else}}
       {{i18n "review.deleted_user"}}
     {{/if}}
   </span>
-  <PluginOutlet @name="after-reviewable-post-user" @connectorTagName="div" @args={{hash user=user}} />
+  <PluginOutlet @name="after-reviewable-post-user" @connectorTagName="div" @args={{hash user=this.user}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
index 58895422e97..dbe7b9b0f0a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-created-by.hbs
@@ -1,6 +1,6 @@
 <div class="created-by">
-  {{#if user}}
-    <UserLink @user={{user}}>{{avatar user imageSize="large"}}</UserLink>
+  {{#if this.user}}
+    <UserLink @user={{this.user}}>{{avatar this.user imageSize="large"}}</UserLink>
   {{else}}
     {{d-icon "far-trash-alt" class="deleted-user-avatar"}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
index d07479c6087..94bd6a0ba11 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-category.hbs
@@ -1 +1 @@
-<CategoryChooser @value={{value}} @onChange={{action "onChange"}} />
+<CategoryChooser @value={{this.value}} @onChange={{action "onChange"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
index f4d56275952..ba8f161d90d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-editor.hbs
@@ -1 +1 @@
-<DEditor @value={{value}} @change={{valueChanged}} />
+<DEditor @value={{this.value}} @change={{this.valueChanged}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
index b81fa4c3d4e..e2719748fcc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-tags.hbs
@@ -1,3 +1,3 @@
-<MiniTagChooser @value={{value}} @onChange={{action "onChange"}} @options={{hash
-    categoryId=tagCategoryId
+<MiniTagChooser @value={{this.value}} @onChange={{action "onChange"}} @options={{hash
+    categoryId=this.tagCategoryId
   }} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
index 2c2c579d800..c058f8918d6 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-text.hbs
@@ -1 +1 @@
-<Input @value={{value}} @change={{valueChanged}} class="reviewable-input-text" />
+<Input @value={{this.value}} @change={{this.valueChanged}} class="reviewable-input-text" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
index 8085c8e4917..9cf042eda7a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field-textarea.hbs
@@ -1 +1 @@
-<Textarea @value={{value}} @change={{valueChanged}} class="reviewable-input-textarea" />
+<Textarea @value={{this.value}} @change={{this.valueChanged}} class="reviewable-input-textarea" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
index af12e4c3777..d53244cb3f9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-field.hbs
@@ -1,6 +1,6 @@
-{{#if value}}
-  <div class={{classes}}>
-    <div class="name">{{name}}</div>
-    <div class="value">{{value}}</div>
+{{#if this.value}}
+  <div class={{this.classes}}>
+    <div class="name">{{this.name}}</div>
+    <div class="value">{{this.value}}</div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
index a681a9af669..4934d4a9805 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-flagged-post.hbs
@@ -1,20 +1,20 @@
 <div class="flagged-post-header">
-  <ReviewableTopicLink @reviewable={{reviewable}} @tagName="" />
-  <ReviewablePostEdits @reviewable={{reviewable}} @tagName="" />
+  <ReviewableTopicLink @reviewable={{this.reviewable}} @tagName="" />
+  <ReviewablePostEdits @reviewable={{this.reviewable}} @tagName="" />
 </div>
 
 <div class="post-contents-wrapper">
-  <ReviewableCreatedBy @user={{reviewable.target_created_by}} @tagName="" />
+  <ReviewableCreatedBy @user={{this.reviewable.target_created_by}} @tagName="" />
   <div class="post-contents">
-    <ReviewablePostHeader @reviewable={{reviewable}} @createdBy={{reviewable.target_created_by}} @tagName="" />
+    <ReviewablePostHeader @reviewable={{this.reviewable}} @createdBy={{this.reviewable.target_created_by}} @tagName="" />
     <div class="post-body">
-      {{#if reviewable.blank_post}}
+      {{#if this.reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{html-safe reviewable.cooked}}
+        {{html-safe this.reviewable.cooked}}
       {{/if}}
     </div>
-    <PluginOutlet @name="after-reviewable-flagged-post-body" @tagName="span" @connectorTagName="div" @args={{hash model=reviewable}} />
+    <PluginOutlet @name="after-reviewable-flagged-post-body" @tagName="span" @connectorTagName="div" @args={{hash model=this.reviewable}} />
     {{yield}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
index 256c5655b82..a81e8ec03d3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-histories.hbs
@@ -1,4 +1,4 @@
-{{#if filteredHistories}}
+{{#if this.filteredHistories}}
   <table class="reviewable-histories">
     <thead>
       <tr>
@@ -6,14 +6,14 @@
       </tr>
     </thead>
     <tbody>
-      {{#each filteredHistories as |rh|}}
+      {{#each this.filteredHistories as |rh|}}
         {{#unless rh.created}}
           <tr>
             <td>
               {{reviewable-history-description rh}}
             </td>
             <td>
-              <UserLink @user={{rs.user}}>
+              <UserLink @user={{this.rs.user}}>
                 {{avatar rh.created_by imageSize="tiny"}}
                 {{rh.created_by.username}}
               </UserLink>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
index 86c30cd2b48..f98826d61bc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-item.hbs
@@ -1,36 +1,36 @@
-<div data-reviewable-id={{reviewable.id}} class="reviewable-item {{customClasses}}">
+<div data-reviewable-id={{this.reviewable.id}} class="reviewable-item {{this.customClasses}}">
   <div class="reviewable-meta-data">
-    <span class="reviewable-type">{{reviewable.humanType}}</span>
-    {{#if reviewable.reply_count}}
-      <span class="reply-count">{{i18n "review.replies" count=reviewable.reply_count}}</span>
+    <span class="reviewable-type">{{this.reviewable.humanType}}</span>
+    {{#if this.reviewable.reply_count}}
+      <span class="reply-count">{{i18n "review.replies" count=this.reviewable.reply_count}}</span>
     {{/if}}
     <span class="created-at">
-      <LinkTo @route="review.show" @model={{reviewable.id}}>{{age-with-tooltip reviewable.created_at}}</LinkTo>
+      <LinkTo @route="review.show" @model={{this.reviewable.id}}>{{age-with-tooltip this.reviewable.created_at}}</LinkTo>
     </span>
     <span class="status">
-      {{reviewable-status reviewable.status}}
+      {{reviewable-status this.reviewable.status}}
     </span>
-    <a href {{action "explainReviewable" reviewable}} title={{i18n "review.explain.why"}} class="explain">
+    <a href {{action "explainReviewable" this.reviewable}} title={{i18n "review.explain.why"}} class="explain">
       {{d-icon "question-circle"}}
     </a>
   </div>
 
   <div class="reviewable-contents">
-    {{#if editing}}
+    {{#if this.editing}}
       <div class="editable-fields">
-        {{#if reviewable.created_by}}
+        {{#if this.reviewable.created_by}}
           <div class="editable-created-by">
-            {{avatar reviewable.created_by imageSize="tiny"}}
-            <ReviewableCreatedByName @user={{reviewable.created_by}} @tagName="" />
+            {{avatar this.reviewable.created_by imageSize="tiny"}}
+            <ReviewableCreatedByName @user={{this.reviewable.created_by}} @tagName="" />
           </div>
         {{/if}}
 
-        {{#each reviewable.editable_fields as |f|}}
+        {{#each this.reviewable.editable_fields as |f|}}
           <div class="editable-field {{dasherize f.id}}">
             {{component (concat "reviewable-field-" f.type)
               tagName=""
-              value=(editable-value reviewable f.id)
-              tagCategoryId=tagCategoryId
+              value=(editable-value this.reviewable f.id)
+              tagCategoryId=this.tagCategoryId
               valueChanged=(action "valueChanged" f.id)
               categoryChanged=(action "categoryChanged")
             }}
@@ -38,33 +38,33 @@
         {{/each}}
       </div>
     {{else}}
-      {{#component reviewableComponent reviewable=reviewable tagName=""}}
-        <ReviewableScores @reviewable={{reviewable}} @tagName="" />
+      {{#component this.reviewableComponent reviewable=this.reviewable tagName=""}}
+        <ReviewableScores @reviewable={{this.reviewable}} @tagName="" />
       {{/component}}
     {{/if}}
   </div>
   <div class="reviewable-actions">
-    {{#if reviewable.last_performing_username}}
-      <div class="stale-help">{{html-safe (i18n "review.stale_help" username=reviewable.last_performing_username)}}</div>
+    {{#if this.reviewable.last_performing_username}}
+      <div class="stale-help">{{html-safe (i18n "review.stale_help" username=this.reviewable.last_performing_username)}}</div>
     {{else}}
-      {{#if claimEnabled}}
+      {{#if this.claimEnabled}}
         <div class="claimed-actions">
-          <span class="help">{{html-safe claimHelp}}</span>
-          <ReviewableClaimedTopic @topicId={{topicId}} @claimedBy={{reviewable.claimed_by}} />
+          <span class="help">{{html-safe this.claimHelp}}</span>
+          <ReviewableClaimedTopic @topicId={{this.topicId}} @claimedBy={{this.reviewable.claimed_by}} />
         </div>
       {{/if}}
 
-      {{#if canPerform}}
-        {{#if editing}}
-          <DButton @class="btn-primary reviewable-action save-edit" @disabled={{disabled}} @icon="check" @action={{action "saveEdit"}} @label="review.save" />
-          <DButton @class="btn-danger reviewable-action cancel-edit" @disabled={{disabled}} @icon="times" @action={{action "cancelEdit"}} @label="review.cancel" />
+      {{#if this.canPerform}}
+        {{#if this.editing}}
+          <DButton @class="btn-primary reviewable-action save-edit" @disabled={{this.disabled}} @icon="check" @action={{action "saveEdit"}} @label="review.save" />
+          <DButton @class="btn-danger reviewable-action cancel-edit" @disabled={{this.disabled}} @icon="times" @action={{action "cancelEdit"}} @label="review.cancel" />
         {{else}}
-          {{#each reviewable.bundled_actions as |bundle|}}
-            <ReviewableBundledAction @bundle={{bundle}} @performAction={{action "perform"}} @reviewableUpdating={{disabled}} />
+          {{#each this.reviewable.bundled_actions as |bundle|}}
+            <ReviewableBundledAction @bundle={{bundle}} @performAction={{action "perform"}} @reviewableUpdating={{this.disabled}} />
           {{/each}}
 
-          {{#if reviewable.can_edit}}
-            <DButton @class="reviewable-action edit" @disabled={{disabled}} @icon="pencil-alt" @action={{action "edit"}} @label="review.edit" />
+          {{#if this.reviewable.can_edit}}
+            <DButton @class="reviewable-action edit" @disabled={{this.disabled}} @icon="pencil-alt" @action={{action "edit"}} @label="review.edit" />
           {{/if}}
         {{/if}}
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
index e6f758133c3..16df22dbb5d 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-edits.hbs
@@ -1,7 +1,5 @@
-{{#if hasEdits}}
-  <a href {{action "showEditHistory"}}
-    class="has-edits {{historyClass}}"
-    title={{i18n "post.last_edited_on" dateTime=editedDate}}>
+{{#if this.hasEdits}}
+  <a href {{action "showEditHistory"}} class="has-edits {{this.historyClass}}" title={{i18n "post.last_edited_on" dateTime=this.editedDate}}>
     {{d-icon "pencil-alt"}}
   </a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
index e589c5c334d..ad1797e69f3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post-header.hbs
@@ -1,7 +1,7 @@
 <div class="reviewable-post-header">
-  <ReviewableCreatedByName @user={{createdBy}} @tagName="" />
-  {{#if reviewable.reply_to_post_number}}
-    <a href={{concat reviewable.topic_url "/" reviewable.reply_to_post_number}} class="reviewable-reply-to">
+  <ReviewableCreatedByName @user={{this.createdBy}} @tagName="" />
+  {{#if this.reviewable.reply_to_post_number}}
+    <a href={{concat this.reviewable.topic_url "/" this.reviewable.reply_to_post_number}} class="reviewable-reply-to">
       {{d-icon "share"}}
       <span>{{i18n "review.in_reply_to"}}</span>
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
index 1f4127c2d80..b9c074117e2 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-post.hbs
@@ -1,17 +1,17 @@
 <div class="flagged-post-header">
-  <ReviewableTopicLink @reviewable={{reviewable}} @tagName="" />
-  <ReviewablePostEdits @reviewable={{reviewable}} @tagName="" />
+  <ReviewableTopicLink @reviewable={{this.reviewable}} @tagName="" />
+  <ReviewablePostEdits @reviewable={{this.reviewable}} @tagName="" />
 </div>
 
 <div class="post-contents-wrapper">
-  <ReviewableCreatedBy @user={{reviewable.target_created_by}} @tagName="" />
+  <ReviewableCreatedBy @user={{this.reviewable.target_created_by}} @tagName="" />
   <div class="post-contents">
-    <ReviewablePostHeader @reviewable={{reviewable}} @createdBy={{reviewable.target_created_by}} @tagName="" />
+    <ReviewablePostHeader @reviewable={{this.reviewable}} @createdBy={{this.reviewable.target_created_by}} @tagName="" />
     <div class="post-body">
-      {{#if reviewable.blank_post}}
+      {{#if this.reviewable.blank_post}}
         <p>{{i18n "review.deleted_post"}}</p>
       {{else}}
-        {{html-safe reviewable.cooked}}
+        {{html-safe this.reviewable.cooked}}
       {{/if}}
     </div>
     {{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
index ffd2173a99d..5c18aab0cde 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-queued-post.hbs
@@ -1,11 +1,11 @@
-<ReviewableTopicLink @reviewable={{reviewable}} @tagName="">
+<ReviewableTopicLink @reviewable={{this.reviewable}} @tagName="">
   <div class="title-text">
     {{d-icon "plus-square" title="review.new_topic"}}
-    {{reviewable.payload.title}}
+    {{this.reviewable.payload.title}}
   </div>
-  {{category-badge reviewable.category}}
-  <ReviewableTags @tags={{reviewable.payload.tags}} @tagName="" />
-  {{#if reviewable.payload.via_email}}
+  {{category-badge this.reviewable.category}}
+  <ReviewableTags @tags={{this.reviewable.payload.tags}} @tagName="" />
+  {{#if this.reviewable.payload.via_email}}
     <a href {{action "showRawEmail"}} class="show-raw-email">
       {{d-icon "far-envelope" title="post.via_email"}}
     </a>
@@ -13,16 +13,16 @@
 </ReviewableTopicLink>
 
 <div class="post-contents-wrapper">
-  <ReviewableCreatedBy @user={{reviewable.created_by}} @tagName="" />
+  <ReviewableCreatedBy @user={{this.reviewable.created_by}} @tagName="" />
 
   <div class="post-contents">
-    <ReviewablePostHeader @reviewable={{reviewable}} @createdBy={{reviewable.created_by}} @tagName="" />
+    <ReviewablePostHeader @reviewable={{this.reviewable}} @createdBy={{this.reviewable.created_by}} @tagName="" />
 
     <CookText
-      @rawText={{reviewable.payload.raw}}
+      @rawText={{this.reviewable.payload.raw}}
       @class="post-body"
-      @categoryId={{reviewable.category_id}}
-      @topicId={{reviewable.topic_id}}
+      @categoryId={{this.reviewable.category_id}}
+      @topicId={{this.reviewable.topic_id}}
       @paintOneboxes={{true}}
       @opts={{hash removeMissing=true}}
     />
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
index abeef1df8d6..4a12c68cf91 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-score.hbs
@@ -1,29 +1,29 @@
 <tr class="reviewable-score">
   <td class="user">
-    <UserLink @user={{rs.user}}>
-      {{avatar rs.user imageSize="tiny"}}
-      {{rs.user.username}}
+    <UserLink @user={{this.rs.user}}>
+      {{avatar this.rs.user imageSize="tiny"}}
+      {{this.rs.user.username}}
     </UserLink>
-    <UserFlagPercentage @agreed={{rs.agree_stats.agreed}} @disagreed={{rs.agree_stats.disagreed}} @ignored={{rs.agree_stats.ignored}} />
+    <UserFlagPercentage @agreed={{this.rs.agree_stats.agreed}} @disagreed={{this.rs.agree_stats.disagreed}} @ignored={{this.rs.agree_stats.ignored}} />
   </td>
   <td>
-    {{d-icon rs.score_type.icon}}
-    {{title}}
+    {{d-icon this.rs.score_type.icon}}
+    {{this.title}}
   </td>
   <td>
-    {{format-date rs.created_at format="tiny"}}
+    {{format-date this.rs.created_at format="tiny"}}
   </td>
 
-  {{#if showStatus}}
+  {{#if this.showStatus}}
     <td class="reviewable-score-spacer">
       {{d-icon "angle-double-right"}}
     </td>
 
     <td class="reviewed-by">
-      {{#if rs.reviewed_by}}
-        <UserLink @user={{rs.reviewed_by}}>
-          {{avatar rs.reviewed_by imageSize="tiny"}}
-          {{rs.reviewed_by.username}}
+      {{#if this.rs.reviewed_by}}
+        <UserLink @user={{this.rs.reviewed_by}}>
+          {{avatar this.rs.reviewed_by imageSize="tiny"}}
+          {{this.rs.reviewed_by.username}}
         </UserLink>
       {{else}}
         &mdash;
@@ -31,11 +31,11 @@
     </td>
 
     <td>
-      {{reviewable-status rs.status}}
+      {{reviewable-status this.rs.status}}
     </td>
     <td>
-      {{#if rs.reviewed_by}}
-        {{format-date rs.reviewed_at format="tiny"}}
+      {{#if this.rs.reviewed_by}}
+        {{format-date this.rs.reviewed_at format="tiny"}}
       {{/if}}
     </td>
   {{else}}
@@ -43,23 +43,23 @@
   {{/if}}
 </tr>
 
-{{#if rs.reason}}
+{{#if this.rs.reason}}
   <tr>
     <td colspan="7">
-      <div class="reviewable-score-reason">{{html-safe rs.reason}}</div>
+      <div class="reviewable-score-reason">{{html-safe this.rs.reason}}</div>
     </td>
   </tr>
 {{/if}}
 
-{{#if rs.reviewable_conversation}}
+{{#if this.rs.reviewable_conversation}}
   <tr>
     <td colspan="7">
       <div class="reviewable-conversation">
-        {{#each rs.reviewable_conversation.conversation_posts as |p index|}}
+        {{#each this.rs.reviewable_conversation.conversation_posts as |p index|}}
           <ReviewableConversationPost @post={{p}} @index={{index}} />
         {{/each}}
         <div class="controls">
-          <a href={{rs.reviewable_conversation.permalink}} class="btn btn-small">
+          <a href={{this.rs.reviewable_conversation.permalink}} class="btn btn-small">
             {{i18n "review.conversation.view_full"}}
           </a>
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
index 93c0c0de0f5..60a1607a616 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-scores.hbs
@@ -1,8 +1,8 @@
-{{#if reviewable.reviewable_scores}}
+{{#if this.reviewable.reviewable_scores}}
   <table class="reviewable-scores">
     <tbody>
-      {{#each reviewable.reviewable_scores as |rs|}}
-        <ReviewableScore @rs={{rs}} @reviewable={{reviewable}} />
+      {{#each this.reviewable.reviewable_scores as |rs|}}
+        <ReviewableScore @rs={{rs}} @reviewable={{this.reviewable}} />
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
index f0d642784c2..d802b3b38dd 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-tags.hbs
@@ -1,5 +1,5 @@
-{{#if tags}}
+{{#if this.tags}}
   <div class="list-tags">
-    {{#each tags as |t|}} {{discourse-tag t}} {{/each}}
+    {{#each this.tags as |t|}} {{discourse-tag t}} {{/each}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
index d4b7fdc467e..d0554116295 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-topic-link.hbs
@@ -1,15 +1,15 @@
 <div class="post-topic">
-  {{#if reviewable.topic}}
-    <TopicStatus @topic={{reviewable.topic}} @showPrivateMessageIcon={{true}} />
-    <a href={{reviewable.target_url}} class="title-text">{{html-safe reviewable.topic.fancyTitle}}</a>
-    {{category-badge reviewable.category}}
-    <ReviewableTags @tags={{reviewable.topic_tags}} @tagName="" />
+  {{#if this.reviewable.topic}}
+    <TopicStatus @topic={{this.reviewable.topic}} @showPrivateMessageIcon={{true}} />
+    <a href={{this.reviewable.target_url}} class="title-text">{{html-safe this.reviewable.topic.fancyTitle}}</a>
+    {{category-badge this.reviewable.category}}
+    <ReviewableTags @tags={{this.reviewable.topic_tags}} @tagName="" />
   {{else if (has-block)}}
     {{yield}}
   {{else}}
     <span class="title-text">
       {{i18n "review.topics.deleted"}}
-      <LinkTo @route="topic" @models={{array "-" reviewable.removed_topic_id}}>{{i18n "review.topics.original"}}</LinkTo>
+      <LinkTo @route="topic" @models={{array "-" this.reviewable.removed_topic_id}}>{{i18n "review.topics.original"}}</LinkTo>
     </span>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
index 0e434dc83a8..3a11353e27b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/reviewable-user.hbs
@@ -3,34 +3,34 @@
     <div class="reviewable-user-details username">
       <div class="name">{{i18n "review.user.username"}}</div>
       <div class="value">
-        {{#if reviewable.link_admin}}
-          <a href={{get-url (concat "/admin/users/" reviewable.user_id "/" reviewable.payload.username)}}>
-            {{reviewable.payload.username}}
+        {{#if this.reviewable.link_admin}}
+          <a href={{get-url (concat "/admin/users/" this.reviewable.user_id "/" this.reviewable.payload.username)}}>
+            {{this.reviewable.payload.username}}
           </a>
         {{else}}
-          {{reviewable.payload.username}}
+          {{this.reviewable.payload.username}}
         {{/if}}
       </div>
     </div>
 
-    <ReviewableField @classes="reviewable-user-details name" @name={{i18n "review.user.name"}} @value={{reviewable.payload.name}} />
+    <ReviewableField @classes="reviewable-user-details name" @name={{i18n "review.user.name"}} @value={{this.reviewable.payload.name}} />
 
-    <ReviewableField @classes="reviewable-user-details email" @name={{i18n "review.user.email"}} @value={{reviewable.payload.email}} />
+    <ReviewableField @classes="reviewable-user-details email" @name={{i18n "review.user.email"}} @value={{this.reviewable.payload.email}} />
 
-    <ReviewableField @classes="reviewable-user-details bio" @name={{i18n "review.user.bio"}} @value={{reviewable.payload.bio}} />
+    <ReviewableField @classes="reviewable-user-details bio" @name={{i18n "review.user.bio"}} @value={{this.reviewable.payload.bio}} />
 
-    {{#if reviewable.payload.website}}
+    {{#if this.reviewable.payload.website}}
       <div class="reviewable-user-details website">
         <div class="name">{{i18n "review.user.website"}}</div>
         <div class="value">
-          <a href={{reviewable.payload.website}} target="_blank" rel="noopener noreferrer">{{reviewable.payload.website}}</a>
+          <a href={{this.reviewable.payload.website}} target="_blank" rel="noopener noreferrer">{{this.reviewable.payload.website}}</a>
         </div>
       </div>
     {{/if}}
 
-    <ReviewableField @classes="reviewable-user-details reject-reason" @name={{i18n "review.user.reject_reason"}} @value={{reviewable.reject_reason}} />
+    <ReviewableField @classes="reviewable-user-details reject-reason" @name={{i18n "review.user.reject_reason"}} @value={{this.reviewable.reject_reason}} />
 
-    {{#each userFields as |f|}}
+    {{#each this.userFields as |f|}}
       <ReviewableField @classes="reviewable-user-details user-field" @name={{f.name}} @value={{f.value}} @tagName="" />
     {{/each}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
index c84fab80060..ead92181ee5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/save-controls.hbs
@@ -1,5 +1,5 @@
-<DButton @action={{this.action}} @disabled={{buttonDisabled}} @label={{savingText}} @class="btn-primary save-changes" />
-{{#if saved}}
+<DButton @action={{this.action}} @disabled={{this.buttonDisabled}} @label={{this.savingText}} @class="btn-primary save-changes" />
+{{#if this.saved}}
   <span class="saved">{{i18n "saved"}}</span>
 {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/components/score-value.hbs b/app/assets/javascripts/discourse/app/templates/components/score-value.hbs
index c6ba3e71608..9b54e240470 100644
--- a/app/assets/javascripts/discourse/app/templates/components/score-value.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/score-value.hbs
@@ -1,9 +1,9 @@
-{{#if value}}
+{{#if this.value}}
   <span class="score-value">
-    <span class="score-number">{{float value}}</span>
-    {{#if label}}
-      <span title={{i18n (concat "review.explain." label ".title")}} class="score-value-type">
-        {{i18n (concat "review.explain." label ".name")}}
+    <span class="score-number">{{float this.value}}</span>
+    {{#if this.label}}
+      <span title={{i18n (concat "review.explain." this.label ".title")}} class="score-value-type">
+        {{i18n (concat "review.explain." this.label ".name")}}
       </span>
     {{/if}}
   </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
index 2c6ac67263e..1ef7d94ac0c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
@@ -3,27 +3,27 @@
 </summary>
 <div class="search-advanced-filters">
   <div class="search-advanced-options">
-    <PluginOutlet @name="advanced-search-options-above" @connectorTagName="div" @args={{hash searchedTerms=searchedTerms onChangeSearchedTermField=onChangeSearchedTermField}} />
+    <PluginOutlet @name="advanced-search-options-above" @connectorTagName="div" @args={{hash searchedTerms=this.searchedTerms onChangeSearchedTermField=this.onChangeSearchedTermField}} />
 
     <div class="control-group advanced-search-category">
       <label class="control-label">{{i18n "search.advanced.in_category.label"}}</label>
       <div class="controls">
-        <SearchAdvancedCategoryChooser @id="search-in-category" @value={{searchedTerms.category.id}} @onChange={{action "onChangeSearchTermForCategory"}} />
+        <SearchAdvancedCategoryChooser @id="search-in-category" @value={{this.searchedTerms.category.id}} @onChange={{action "onChangeSearchTermForCategory"}} />
       </div>
     </div>
 
-    {{#if siteSettings.tagging_enabled}}
+    {{#if this.siteSettings.tagging_enabled}}
       <div class="control-group advanced-search-tags">
         <label class="control-label">{{i18n "search.advanced.with_tags.label"}}</label>
         <div class="controls">
-          <TagChooser @id="search-with-tags" @tags={{searchedTerms.tags}} @everyTag={{true}} @unlimitedTagCount={{true}} @onChange={{action "onChangeSearchTermForTags"}} @options={{hash
+          <TagChooser @id="search-with-tags" @tags={{this.searchedTerms.tags}} @everyTag={{true}} @unlimitedTagCount={{true}} @onChange={{action "onChangeSearchTermForTags"}} @options={{hash
               allowAny=false
               headerAriaLabel=(i18n "search.advanced.with_tags.aria_label")
             }} />
-          {{#if showAllTagsCheckbox}}
+          {{#if this.showAllTagsCheckbox}}
             <section class="field">
               <label>
-                <Input @type="checkbox" class="all-tags" @checked={{searchedTerms.special.all_tags}} @click={{action "onChangeSearchTermForAllTags" value="target.checked"}} />
+                <Input @type="checkbox" class="all-tags" @checked={{this.searchedTerms.special.all_tags}} @click={{action "onChangeSearchTermForAllTags" value="target.checked"}} />
                 {{i18n "search.advanced.filters.all_tags"}}
               </label>
             </section>
@@ -37,31 +37,31 @@
         <fieldset class="grouped-control">
           <legend class="grouped-control-label">{{i18n "search.advanced.filters.label"}}</legend>
 
-          {{#if currentUser}}
+          {{#if this.currentUser}}
             <div class="grouped-control-field">
-              <Input @id="matching-title-only" @type="checkbox" class="in-title" @checked={{searchedTerms.special.in.title}} @click={{action "onChangeSearchTermForSpecialInTitle" value="target.checked"}} />
+              <Input @id="matching-title-only" @type="checkbox" class="in-title" @checked={{this.searchedTerms.special.in.title}} @click={{action "onChangeSearchTermForSpecialInTitle" value="target.checked"}} />
               <label for="matching-title-only">
                 {{i18n "search.advanced.filters.title"}}
               </label>
             </div>
 
             <div class="grouped-control-field">
-              <Input @id="matching-liked" @type="checkbox" class="in-likes" @checked={{searchedTerms.special.in.likes}} @click={{action "onChangeSearchTermForSpecialInLikes" value="target.checked"}} />
+              <Input @id="matching-liked" @type="checkbox" class="in-likes" @checked={{this.searchedTerms.special.in.likes}} @click={{action "onChangeSearchTermForSpecialInLikes" value="target.checked"}} />
               <label for="matching-liked">{{i18n "search.advanced.filters.likes"}}</label>
             </div>
 
             <div class="grouped-control-field">
-              <Input @id="matching-in-messages" @type="checkbox" class="in-private" @checked={{searchedTerms.special.in.messages}} @click={{action "onChangeSearchTermForSpecialInMessages" value="target.checked"}} />
+              <Input @id="matching-in-messages" @type="checkbox" class="in-private" @checked={{this.searchedTerms.special.in.messages}} @click={{action "onChangeSearchTermForSpecialInMessages" value="target.checked"}} />
               <label for="matching-in-messages">{{i18n "search.advanced.filters.private"}}</label>
             </div>
 
             <div class="grouped-control-field">
-              <Input @id="matching-seen" @type="checkbox" class="in-seen" @checked={{searchedTerms.special.in.seen}} @click={{action "onChangeSearchTermForSpecialInSeen" value="target.checked"}} />
+              <Input @id="matching-seen" @type="checkbox" class="in-seen" @checked={{this.searchedTerms.special.in.seen}} @click={{action "onChangeSearchTermForSpecialInSeen" value="target.checked"}} />
               <label for="matching-seen">{{i18n "search.advanced.filters.seen"}}</label>
             </div>
           {{/if}}
 
-          <ComboBox @id="in" @valueProperty="value" @content={{inOptions}} @value={{searchedTerms.in}} @onChange={{action "onChangeSearchTermForIn"}} @options={{hash
+          <ComboBox @id="in" @valueProperty="value" @content={{this.inOptions}} @value={{this.searchedTerms.in}} @onChange={{action "onChangeSearchTermForIn"}} @options={{hash
               none="user.locale.any"
               clearable=true
             }} />
@@ -72,7 +72,7 @@
     <div class="control-group advanced-search-topic-status">
       <label class="control-label">{{i18n "search.advanced.statuses.label"}}</label>
       <div class="controls">
-        <ComboBox @id="search-status-options" @valueProperty="value" @content={{statusOptions}} @value={{searchedTerms.status}} @onChange={{action "onChangeSearchTermForStatus"}} @options={{hash
+        <ComboBox @id="search-status-options" @valueProperty="value" @content={{this.statusOptions}} @value={{this.searchedTerms.status}} @onChange={{action "onChangeSearchTermForStatus"}} @options={{hash
             none="user.locale.any"
             headerAriaLabel=(i18n "search.advanced.statuses.label")
             clearable=true
@@ -85,7 +85,7 @@
         {{i18n "search.advanced.posted_by.label"}}
       </label>
       <div class="controls">
-        <UserChooser @id="search-posted-by" @value={{searchedTerms.username}} @onChange={{action "onChangeSearchTermForUsername"}} @options={{hash
+        <UserChooser @id="search-posted-by" @value={{this.searchedTerms.username}} @onChange={{action "onChangeSearchTermForUsername"}} @options={{hash
             headerAriaLabel=(i18n "search.advanced.posted_by.aria_label")
             maximum=1
             excludeCurrentUser=false
@@ -96,14 +96,14 @@
     <div class="control-group advanced-search-posted-date">
       <label class="control-label">{{i18n "search.advanced.post.time.label"}}</label>
       <div class="controls inline-form full-width">
-        <ComboBox @id="postTime" @valueProperty="value" @content={{postTimeOptions}} @value={{searchedTerms.time.when}} @onChange={{action "onChangeWhenTime"}} @options={{hash
+        <ComboBox @id="postTime" @valueProperty="value" @content={{this.postTimeOptions}} @value={{this.searchedTerms.time.when}} @onChange={{action "onChangeWhenTime"}} @options={{hash
             headerAriaLabel=(i18n "search.advanced.post.time.aria_label")
           }} />
-        <DateInput @date={{searchedTerms.time.days}} @onChange={{action "onChangeWhenDate"}} @inputId="search-post-date" />
+        <DateInput @date={{this.searchedTerms.time.days}} @onChange={{action "onChangeWhenDate"}} @inputId="search-post-date" />
       </div>
     </div>
 
-    <PluginOutlet @name="advanced-search-options-below" @connectorTagName="div" @args={{hash searchedTerms=searchedTerms onChangeSearchedTermField=onChangeSearchedTermField}} />
+    <PluginOutlet @name="advanced-search-options-below" @connectorTagName="div" @args={{hash searchedTerms=this.searchedTerms onChangeSearchedTermField=this.onChangeSearchedTermField}} />
   </div>
 
   <details class="search-advanced-additional-options">
@@ -114,9 +114,9 @@
       {{!-- TODO: Using a label here fails no-nested-interactive lint rule --}}
       <span class="control-label">{{i18n "search.advanced.post.count.label"}}</span>
       <div class="controls">
-        <Input @type="number" @value={{readonly searchedTerms.min_posts}} class="input-small" @id="search-min-post-count" @input={{action "onChangeSearchTermMinPostCount" value="target.value"}} placeholder={{i18n "search.advanced.post.min.placeholder"}} @aria-label={{i18n "search.advanced.post.min.aria_label"}} />
+        <Input @type="number" @value={{readonly this.searchedTerms.min_posts}} class="input-small" @id="search-min-post-count" @input={{action "onChangeSearchTermMinPostCount" value="target.value"}} placeholder={{i18n "search.advanced.post.min.placeholder"}} @aria-label={{i18n "search.advanced.post.min.aria_label"}} />
         {{d-icon "arrows-alt-h"}}
-        <Input @type="number" @value={{readonly searchedTerms.max_posts}} class="input-small" @id="search-max-post-count" @input={{action "onChangeSearchTermMaxPostCount" value="target.value"}} placeholder={{i18n "search.advanced.post.max.placeholder"}} @aria-label={{i18n "search.advanced.post.max.aria_label"}} />
+        <Input @type="number" @value={{readonly this.searchedTerms.max_posts}} class="input-small" @id="search-max-post-count" @input={{action "onChangeSearchTermMaxPostCount" value="target.value"}} placeholder={{i18n "search.advanced.post.max.placeholder"}} @aria-label={{i18n "search.advanced.post.max.aria_label"}} />
       </div>
     </div>
 
@@ -124,16 +124,16 @@
       {{!-- TODO: Using a label here fails no-nested-interactive lint rule --}}
       <span class="control-label">{{i18n "search.advanced.views.label"}}</span>
       <div class="controls">
-        <Input @type="number" @value={{readonly searchedTerms.min_views}} class="input-small" @id="search-min-views" @input={{action "onChangeSearchTermMinViews" value="target.value"}} placeholder={{i18n "search.advanced.min_views.placeholder"}} @aria-label={{i18n "search.advanced.min_views.aria_label"}} />
+        <Input @type="number" @value={{readonly this.searchedTerms.min_views}} class="input-small" @id="search-min-views" @input={{action "onChangeSearchTermMinViews" value="target.value"}} placeholder={{i18n "search.advanced.min_views.placeholder"}} @aria-label={{i18n "search.advanced.min_views.aria_label"}} />
         {{d-icon "arrows-alt-h"}}
-        <Input @type="number" @value={{readonly searchedTerms.max_views}} class="input-small" @id="search-max-views" @input={{action "onChangeSearchTermMaxViews" value="target.value"}} placeholder={{i18n "search.advanced.max_views.placeholder"}} @aria-label={{i18n "search.advanced.max_views.aria_label"}} />
+        <Input @type="number" @value={{readonly this.searchedTerms.max_views}} class="input-small" @id="search-max-views" @input={{action "onChangeSearchTermMaxViews" value="target.value"}} placeholder={{i18n "search.advanced.max_views.placeholder"}} @aria-label={{i18n "search.advanced.max_views.aria_label"}} />
       </div>
     </div>
   </details>
 
-  {{#if site.mobileView}}
+  {{#if this.site.mobileView}}
     <div class="second-search-button">
-      <DButton @action={{search}} @icon="search" @label="search.search_button" @class="btn-primary search-cta" @ariaLabel="search.search_button" @disabled={{searchButtonDisabled}} />
+      <DButton @action={{this.search}} @icon="search" @label="search.search_button" @class="btn-primary search-cta" @ariaLabel="search.search_button" @disabled={{this.searchButtonDisabled}} />
     </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
index eed27b798b9..c44e6fcc3c3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entries.hbs
@@ -1,5 +1,5 @@
 <div class="fps-result-entries" role="list">
-  {{#each posts as |post|}}
-    <SearchResultEntry @post={{post}} @bulkSelectEnabled={{bulkSelectEnabled}} @selected={{selected}} @highlightQuery={{highlightQuery}} @searchLogId={{searchLogId}} />
+  {{#each this.posts as |post|}}
+    <SearchResultEntry @post={{post}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @selected={{this.selected}} @highlightQuery={{this.highlightQuery}} @searchLogId={{this.searchLogId}} />
   {{/each}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
index de62d7f7161..25a563daa03 100644
--- a/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/search-result-entry.hbs
@@ -1,63 +1,63 @@
 <div class="author">
-  <a href={{post.userPath}} data-user-card={{post.username}}>
-    {{avatar post imageSize="large"}}
+  <a href={{this.post.userPath}} data-user-card={{this.post.username}}>
+    {{avatar this.post imageSize="large"}}
   </a>
 </div>
 
 <div class="fps-topic">
   <div class="topic">
-    {{#if bulkSelectEnabled}}
-      <TrackSelected @selectedList={{selected}} @selectedId={{post.topic}} @class="bulk-select" />
+    {{#if this.bulkSelectEnabled}}
+      <TrackSelected @selectedList={{this.selected}} @selectedId={{this.post.topic}} @class="bulk-select" />
     {{/if}}
 
-    <a href={{post.url}} {{action "logClick" post.topic_id}} class="search-link{{if post.topic.visited " visited"}}" role="heading" aria-level="2">
-      {{raw "topic-status" topic=post.topic showPrivateMessageIcon=true}}
+    <a href={{this.post.url}} {{action "logClick" this.post.topic_id}} class="search-link{{if this.post.topic.visited " visited"}}" role="heading" aria-level="2">
+      {{raw "topic-status" topic=this.post.topic showPrivateMessageIcon=true}}
       <span class="topic-title">
-        {{#if post.useTopicTitleHeadline}}
-          {{html-safe post.topicTitleHeadline}}
+        {{#if this.post.useTopicTitleHeadline}}
+          {{html-safe this.post.topicTitleHeadline}}
         {{else}}
-          <HighlightSearch @highlight={{highlightQuery}}>
-            {{html-safe post.topic.fancyTitle}}
+          <HighlightSearch @highlight={{this.highlightQuery}}>
+            {{html-safe this.post.topic.fancyTitle}}
           </HighlightSearch>
         {{/if}}
       </span>
     </a>
 
     <div class="search-category">
-      {{#if post.topic.category.parentCategory}}
-        {{category-link post.topic.category.parentCategory}}
+      {{#if this.post.topic.category.parentCategory}}
+        {{category-link this.post.topic.category.parentCategory}}
       {{/if}}
-      {{category-link post.topic.category hideParent=true}}
-      {{#if post.topic}}
-        {{discourse-tags post.topic}}
+      {{category-link this.post.topic.category hideParent=true}}
+      {{#if this.post.topic}}
+        {{discourse-tags this.post.topic}}
       {{/if}}
-      <PluginOutlet @name="full-page-search-category" @tagName="span" @connectorTagName="div" @args={{hash post=post}} />
+      <PluginOutlet @name="full-page-search-category" @tagName="span" @connectorTagName="div" @args={{hash post=this.post}} />
     </div>
   </div>
 
   <div class="blurb container">
     <span class="date">
-      {{format-date post.created_at format="tiny"}}
-      {{#if post.blurb}}
+      {{format-date this.post.created_at format="tiny"}}
+      {{#if this.post.blurb}}
         <span class="separator">-</span>
       {{/if}}
     </span>
 
-    {{#if post.blurb}}
-      {{#if siteSettings.use_pg_headlines_for_excerpt}}
-        {{html-safe post.blurb}}
+    {{#if this.post.blurb}}
+      {{#if this.siteSettings.use_pg_headlines_for_excerpt}}
+        {{html-safe this.post.blurb}}
       {{else}}
-        <HighlightSearch @highlight={{highlightQuery}}>
-          {{html-safe post.blurb}}
+        <HighlightSearch @highlight={{this.highlightQuery}}>
+          {{html-safe this.post.blurb}}
         </HighlightSearch>
       {{/if}}
     {{/if}}
   </div>
 
-  {{#if showLikeCount}}
-    {{#if post.like_count}}
+  {{#if this.showLikeCount}}
+    {{#if this.post.like_count}}
       <span class="like-count">
-        <span class="value">{{post.like_count}}</span> {{d-icon "heart"}}
+        <span class="value">{{this.post.like_count}}</span> {{d-icon "heart"}}
       </span>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
index dc03f52d54b..b5f1fbfbe25 100644
--- a/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/second-factor-form.hbs
@@ -1,13 +1,13 @@
 <div id="second-factor">
-  <h3>{{secondFactorTitle}}</h3>
-  {{#if optionalText}}
-    <p>{{html-safe optionalText}}</p>
+  <h3>{{this.secondFactorTitle}}</h3>
+  {{#if this.optionalText}}
+    <p>{{html-safe this.optionalText}}</p>
   {{/if}}
-  <p>{{secondFactorDescription}}</p>
+  <p>{{this.secondFactorDescription}}</p>
   {{yield}}
-  {{#if showToggleMethodLink}}
+  {{#if this.showToggleMethodLink}}
     <p>
-      <a href="" class="toggle-second-factor-method" {{action "toggleSecondFactorMethod"}}>{{ i18n linkText }}</a>
+      <a href="" class="toggle-second-factor-method" {{action "toggleSecondFactorMethod"}}>{{ i18n this.linkText }}</a>
     </p>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs b/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
index 4e228f5c1da..917cb0e969a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/second-factor-input.hbs
@@ -1 +1 @@
-<TextField @value={{value}} @type={{type}} @pattern={{pattern}} @maxlength={{maxlength}} @class="second-factor-token-input" @id={{inputId}} @autocapitalize="off" @autocomplete="one-time-code" @autocorrect="off" @autofocus="autofocus" @placeholder={{placeholder}} @input={{action "onInput"}} />
+<TextField @value={{this.value}} @type={{this.type}} @pattern={{this.pattern}} @maxlength={{this.maxlength}} @class="second-factor-token-input" @id={{this.inputId}} @autocapitalize="off" @autocomplete="one-time-code" @autocorrect="off" @autofocus="autofocus" @placeholder={{this.placeholder}} @input={{action "onInput"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
index 014654d3958..f0f70b3c6c0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/security-key-form.hbs
@@ -1,7 +1,7 @@
 <div id="security-key">
   <DButton @action={{this.action}} @icon="key" @id="security-key-authenticate-button" @label="login.security_key_authenticate" @type="button" @class="btn btn-large btn-primary" />
   <p>
-    {{#if otherMethodAllowed}}
+    {{#if this.otherMethodAllowed}}
       <a href="" class="toggle-second-factor-method" {{action "useAnotherMethod"}}>{{ i18n "login.security_key_alternative" }}</a>
     {{/if}}
   </p>
diff --git a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
index b054b0f288a..09afc7c50ae 100644
--- a/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/selected-posts.hbs
@@ -1,41 +1,41 @@
 <p>
-  <CountI18n @key="topic.multi_select.description" @count={{selectedPostsCount}} />
+  <CountI18n @key="topic.multi_select.description" @count={{this.selectedPostsCount}} />
 </p>
 
-{{#if canSelectAll}}
+{{#if this.canSelectAll}}
   <p>
-    <a class="select-all" href {{action selectAll}}>
+    <a class="select-all" href {{action this.selectAll}}>
       {{i18n "topic.multi_select.select_all"}}
     </a>
   </p>
 {{/if}}
 
-{{#if canDeselectAll}}
+{{#if this.canDeselectAll}}
   <p>
-    <a href {{action deselectAll}}>
+    <a href {{action this.deselectAll}}>
       {{i18n "topic.multi_select.deselect_all"}}
     </a>
   </p>
 {{/if}}
 
-{{#if canDeleteSelected}}
-  <DButton @action={{deleteSelected}} @icon="far-trash-alt" @label="topic.multi_select.delete" @class="btn-danger" />
+{{#if this.canDeleteSelected}}
+  <DButton @action={{this.deleteSelected}} @icon="far-trash-alt" @label="topic.multi_select.delete" @class="btn-danger" />
 {{/if}}
 
-{{#if canMergeTopic}}
+{{#if this.canMergeTopic}}
   <DButton @action={{route-action "moveToTopic"}} @icon="sign-out-alt" @label="topic.move_to.action" @class="btn-primary move-to-topic" />
 {{/if}}
 
-{{#if canChangeOwner}}
+{{#if this.canChangeOwner}}
   <DButton @action={{route-action "changeOwner"}} @icon="user" @label="topic.change_owner.action" @class="btn-primary" />
 {{/if}}
 
-{{#if canMergePosts}}
-  <DButton @action={{mergePosts}} @icon="arrows-alt-v" @label="topic.merge_posts.action" @class="btn-primary" />
+{{#if this.canMergePosts}}
+  <DButton @action={{this.mergePosts}} @icon="arrows-alt-v" @label="topic.merge_posts.action" @class="btn-primary" />
 {{/if}}
 
 <p class="cancel">
-  <a href {{action toggleMultiSelect}}>
+  <a href {{action this.toggleMultiSelect}}>
     {{i18n "topic.multi_select.cancel"}}
   </a>
 </p>
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs b/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
index 9ef8362874e..a9b016c5022 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-panel.hbs
@@ -1,13 +1,13 @@
 <div class="header">
-  <h3 class="title">{{html-safe shareTitle}}</h3>
+  <h3 class="title">{{html-safe this.shareTitle}}</h3>
 </div>
 
 <div class="body">
-  <DTextarea @value={{shareUrl}} @class="topic-share-url" @aria-label={{I18n "share.url"}} />
+  <DTextarea @value={{this.shareUrl}} @class="topic-share-url" @aria-label={{I18n "share.url"}} />
 
   <div class="sources">
-    {{#each sources as |source|}}
-      <ShareSource @source={{source}} @title={{topic.title}} @action={{action "share"}} />
+    {{#each this.sources as |source|}}
+      <ShareSource @source={{source}} @title={{this.topic.title}} @action={{action "share"}} />
     {{/each}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
index 60d97e36cd9..939a3625162 100644
--- a/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/share-source.hbs
@@ -1 +1 @@
-<DButton @action={{action "share" source}} @class={{concat "btn-default share-" source.id}} @translatedTitle={{source.title}} @icon={{if source.icon source.icon source.htmlIcon}} />
+<DButton @action={{action "share" this.source}} @class={{concat "btn-default share-" this.source.id}} @translatedTitle={{this.source.title}} @icon={{if this.source.icon this.source.icon this.source.htmlIcon}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
index 7e562db7c79..6b595fb3557 100644
--- a/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/shared-draft-controls.hbs
@@ -1,16 +1,16 @@
 <div class="shared-draft-controls">
-  {{#if publishing}}
+  {{#if this.publishing}}
     {{i18n "shared_drafts.publishing"}}
   {{else}}
     {{i18n "shared_drafts.notice"}}
 
     <div class="publish-field">
       <label>{{i18n "shared_drafts.destination_category"}}</label>
-      <CategoryChooser @value={{topic.destination_category_id}} @onChange={{action "updateDestinationCategory"}} />
+      <CategoryChooser @value={{this.topic.destination_category_id}} @onChange={{action "updateDestinationCategory"}} />
     </div>
 
     <div class="publish-field">
-      {{#if validCategory}}
+      {{#if this.validCategory}}
         <DButton @action={{action "publish"}} @label="shared_drafts.publish" @class="btn-primary publish-shared-draft" @icon="far-clipboard" />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
index da7c98608d6..0a1e67a44ed 100644
--- a/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/signup-cta.hbs
@@ -1,5 +1,5 @@
 <div class="signup-cta alert alert-info">
-  {{#if session.hideSignupCta}}
+  {{#if this.session.hideSignupCta}}
     <h3>
       {{i18n "signup_cta.hidden_for_session"}}
     </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
index f05e0588d2d..d23f035346f 100644
--- a/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/slow-mode-info.hbs
@@ -1,12 +1,12 @@
-{{#if showSlowModeNotice}}
+{{#if this.showSlowModeNotice}}
   <div class="topic-status-info">
     <h3 class="slow-mode-heading">
       <span>
         {{d-icon "hourglass-start"}}
-        {{i18n "topic.slow_mode_notice.duration" duration=durationText}}
+        {{i18n "topic.slow_mode_notice.duration" duration=this.durationText}}
       </span>
 
-      {{#if user.canManageTopic}}
+      {{#if this.user.canManageTopic}}
         <DButton @class="slow-mode-remove" @action={{action "disableSlowMode"}} @icon="trash-alt" />
       {{/if}}
     </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
index 7e844730abc..728cf5cb3ed 100644
--- a/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/software-update-prompt.hbs
@@ -1,5 +1,5 @@
-{{#if showPrompt}}
-  <div class="software-update-prompt{{if animatePrompt " require-software-refresh"}}">
+{{#if this.showPrompt}}
+  <div class="software-update-prompt{{if this.animatePrompt " require-software-refresh"}}">
     <div class="wrap">
       <div class="update-prompt-main-content" aria-live="polite">
         <span role="button" onclick={{action "refreshPage"}} class="update-prompt-message">{{d-icon "redo"}} {{html-safe (i18n "software_update_prompt.message")}}</span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs b/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
index edc3f6bfcdf..b2861743626 100644
--- a/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/sub-category-item.hbs
@@ -1,9 +1,9 @@
-{{#unless isMuted}}
+{{#unless this.isMuted}}
   <span class="subcategory">
-    <CategoryTitleBefore @category={{category}} />
-    {{category-link category hideParent="true"}}
-    {{#unless hideUnread}}
-      <CategoryUnread @category={{category}} />
+    <CategoryTitleBefore @category={{this.category}} />
+    {{category-link this.category hideParent="true"}}
+    {{#unless this.hideUnread}}
+      <CategoryUnread @category={{this.category}} />
     {{/unless}}
   </span>
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
index 3244a1303d4..77051913b94 100644
--- a/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/sub-category-row.hbs
@@ -1,16 +1,16 @@
-{{#unless isHidden}}
-  <tr data-category-id={{category.id}} data-notification-level={{category.notificationLevelString}} class="{{if category.description_excerpt "has-description" "no-description"}} {{if category.uploaded_logo.url "has-logo" "no-logo"}}">
-    <td class="category {{if isMuted "muted"}}" style={{border-color category.color}}>
-      <CategoryTitleLink @tagName="h4" @category={{category}} />
-      {{#if category.description_excerpt}}
+{{#unless this.isHidden}}
+  <tr data-category-id={{this.category.id}} data-notification-level={{this.category.notificationLevelString}} class="{{if this.category.description_excerpt "has-description" "no-description"}} {{if this.category.uploaded_logo.url "has-logo" "no-logo"}}">
+    <td class="category {{if this.isMuted "muted"}}" style={{border-color this.category.color}}>
+      <CategoryTitleLink @tagName="h4" @category={{this.category}} />
+      {{#if this.category.description_excerpt}}
         <div class="category-description subcategory-description">
-          {{dir-span category.description_excerpt htmlSafe="true"}}
+          {{dir-span this.category.description_excerpt htmlSafe="true"}}
         </div>
       {{/if}}
-      {{#if category.subcategories}}
+      {{#if this.category.subcategories}}
         <div class="subcategories">
-          {{#each category.subcategories as |subsubcategory|}}
-            <SubCategoryItem @category={{subsubcategory}} @hideUnread="true" @listType={{listType}} />
+          {{#each this.category.subcategories as |subsubcategory|}}
+            <SubCategoryItem @category={{subsubcategory}} @hideUnread="true" @listType={{this.listType}} />
           {{/each}}
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs
index a990d1bce88..0f8d79533e4 100644
--- a/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/subcategories-with-featured-topics.hbs
@@ -1,4 +1,4 @@
-{{#each categories as |category|}}
+{{#each this.categories as |category|}}
   <table class="category-list subcategory-list with-topics">
     <thead>
       <tr>
diff --git a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
index 5923ffd129a..77ad43678b3 100644
--- a/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/suggested-topics.hbs
@@ -1,20 +1,19 @@
-<div id="suggested-topics" class="suggested-topics"
-    role="complementary" aria-labelledby="suggested-topics-title">
+<div id="suggested-topics" class="suggested-topics" role="complementary" aria-labelledby="suggested-topics-title">
   <h3 id="suggested-topics-title" class="suggested-topics-title">
-    {{i18n suggestedTitleLabel}}
+    {{i18n this.suggestedTitleLabel}}
   </h3>
 
   <div class="topics">
-    {{#if topic.isPrivateMessage}}
-      <BasicTopicList @hideCategory="true" @showPosters="true" @topics={{topic.suggestedTopics}} />
+    {{#if this.topic.isPrivateMessage}}
+      <BasicTopicList @hideCategory="true" @showPosters="true" @topics={{this.topic.suggestedTopics}} />
     {{else}}
-      <BasicTopicList @topics={{topic.suggestedTopics}} />
+      <BasicTopicList @topics={{this.topic.suggestedTopics}} />
     {{/if}}
   </div>
 
   <h3 class="suggested-topics-message">
-    {{html-safe browseMoreMessage}}
+    {{html-safe this.browseMoreMessage}}
   </h3>
 </div>
 
-<PluginOutlet @name="below-suggested-topics" @tagName="span" @connectorTagName="div" @args={{hash topic=topic}} />
+<PluginOutlet @name="below-suggested-topics" @tagName="span" @connectorTagName="div" @args={{hash topic=this.topic}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
index edd9dd3b3e7..b4a450f6491 100644
--- a/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/table-header-toggle.hbs
@@ -1,8 +1,8 @@
 <span
   class="header-contents"
-  id={{id}}
+  id={{this.id}}
   role="button"
   tabindex="0">
-  {{directory-table-header-title field=field labelKey=labelKey icon=icon translated=translated}}
-  {{chevronIcon}}
+  {{directory-table-header-title field=this.field labelKey=this.labelKey icon=this.icon translated=this.translated}}
+  {{this.chevronIcon}}
 </span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
index e8adb89fe43..e9050178f26 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-drop-link.hbs
@@ -1 +1 @@
-{{tagId}}
+{{this.tagId}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
index ced5f82bb9c..c5c86d837e5 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
@@ -1,11 +1,11 @@
 <section class="group-name">
   <label>{{i18n "tagging.groups.name_placeholder"}}</label>
-  <div><TextField @value={{buffered.name}} /></div>
+  <div><TextField @value={{this.buffered.name}} /></div>
 </section>
 
 <section class="group-tags-list">
   <label>{{i18n "tagging.groups.tags_label"}}</label><br>
-  <TagChooser @tags={{buffered.tag_names}} @everyTag={{true}} @unlimitedTagCount={{true}} @excludeSynonyms={{true}} @options={{hash
+  <TagChooser @tags={{this.buffered.tag_names}} @everyTag={{true}} @unlimitedTagCount={{true}} @excludeSynonyms={{true}} @options={{hash
       allowAny=true
       filterPlaceholder="tagging.groups.tags_placeholder"
     }} />
@@ -14,7 +14,7 @@
 <section class="parent-tag-section">
   <label>{{i18n "tagging.groups.parent_tag_label"}}</label>
   <div>
-    <TagChooser @tags={{buffered.parent_tag_name}} @everyTag={{true}} @excludeSynonyms={{true}} @options={{hash
+    <TagChooser @tags={{this.buffered.parent_tag_name}} @everyTag={{true}} @excludeSynonyms={{true}} @options={{hash
         allowAny=true
         filterPlaceholder="tagging.groups.parent_tag_placeholder"
         maximum=1
@@ -25,41 +25,41 @@
 
 <section class="group-one-per-topic">
   <label>
-    <Input @type="checkbox" @checked={{buffered.one_per_topic}} @name="onepertopic" />
+    <Input @type="checkbox" @checked={{this.buffered.one_per_topic}} @name="onepertopic" />
     {{i18n "tagging.groups.one_per_topic_label"}}
   </label>
 </section>
 
 <section class="group-visibility">
   <div class="group-visibility-option">
-    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="public" @id="public-permission" @selection={{buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
+    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="public" @id="public-permission" @selection={{this.buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
 
     <label class="radio" for="public-permission">
       {{i18n "tagging.groups.everyone_can_use"}}
     </label>
   </div>
   <div class="group-visibility-option">
-    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="visible" @id="visible-permission" @selection={{buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
+    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="visible" @id="visible-permission" @selection={{this.buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
 
     <label class="radio" for="visible-permission">
       {{i18n "tagging.groups.usable_only_by_groups"}}
     </label>
 
     <div class="group-access-control">
-      <GroupChooser @content={{allGroups}} @value={{selectedGroupIds}} @labelProperty="name" @onChange={{action "setPermissionsGroups"}} @options={{hash
+      <GroupChooser @content={{this.allGroups}} @value={{this.selectedGroupIds}} @labelProperty="name" @onChange={{action "setPermissionsGroups"}} @options={{hash
           filterPlaceholder="tagging.groups.select_groups_placeholder"
         }} />
     </div>
   </div>
   <div class="group-visibility-option">
-    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="private" @id="private-permission" @selection={{buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
+    <RadioButton @class="tag-permissions-choice" @name="tag-permissions-choice" @value="private" @id="private-permission" @selection={{this.buffered.permissionName}} @onChange={{action "setPermissionsType"}} />
 
     <label class="radio" for="private-permission">
       {{i18n "tagging.groups.visible_only_to_groups"}}
     </label>
 
     <div class="group-access-control">
-      <GroupChooser @content={{allGroups}} @value={{selectedGroupIds}} @labelProperty="name" @onChange={{action "setPermissionsGroups"}} @options={{hash
+      <GroupChooser @content={{this.allGroups}} @value={{this.selectedGroupIds}} @labelProperty="name" @onChange={{action "setPermissionsGroups"}} @options={{hash
           filterPlaceholder="tagging.groups.select_groups_placeholder"
         }} />
     </div>
@@ -67,7 +67,7 @@
 </section>
 
 <div class="tag-group-controls">
-  <DButton @class="btn-primary" @action={{action "save"}} @disabled={{buffered.isSaving}} @label="tagging.groups.save" />
+  <DButton @class="btn-primary" @action={{action "save"}} @disabled={{this.buffered.isSaving}} @label="tagging.groups.save" />
 
-  <DButton @class="btn-danger" @action={{action "destroy"}} @disabled={{buffered.isNew}} @icon="far-trash-alt" @label="tagging.groups.delete" />
+  <DButton @class="btn-danger" @action={{action "destroy"}} @disabled={{this.buffered.isNew}} @icon="far-trash-alt" @label="tagging.groups.delete" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
index bf50c171d4d..4e1c2737671 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-info.hbs
@@ -1,13 +1,13 @@
 <section class="tag-info">
-  {{#if tagInfo}}
+  {{#if this.tagInfo}}
     <div class="tag-name">
-      {{#if editing}}
+      {{#if this.editing}}
         <div class="edit-tag-wrapper">
-          <TextField @id="edit-name" @value={{readonly tagInfo.name}} @maxlength={{siteSettings.max_tag_length}} @input={{action (mut newTagName) value="target.value"}} @autofocus="true" />
-          <TextField @id="edit-description" @value={{readonly tagInfo.description}} @placeholder={{i18n "tagging.description"}} @maxlength={{280}} @input={{action (mut newTagDescription) value="target.value"}} @autofocus="true" />
+          <TextField @id="edit-name" @value={{readonly this.tagInfo.name}} @maxlength={{this.siteSettings.max_tag_length}} @input={{action (mut this.newTagName) value="target.value"}} @autofocus="true" />
+          <TextField @id="edit-description" @value={{readonly this.tagInfo.description}} @placeholder={{i18n "tagging.description"}} @maxlength={{280}} @input={{action (mut this.newTagDescription) value="target.value"}} @autofocus="true" />
 
           <div class="edit-controls">
-            {{#unless updateDisabled}}
+            {{#unless this.updateDisabled}}
               <DButton @action={{action "finishedEditing"}} @class="btn-primary submit-edit" @icon="check" @ariaLabel="tagging.save" />
             {{/unless}}
             <DButton @action={{action "cancelEditing"}} @class="btn-default cancel-edit" @icon="times" @ariaLabel="cancel" />
@@ -15,47 +15,47 @@
         </div>
       {{else}}
         <div class="tag-name-wrapper">
-          {{discourse-tag tagInfo.name tagName="div"}}
-          {{#if canAdminTag}}
+          {{discourse-tag this.tagInfo.name tagName="div"}}
+          {{#if this.canAdminTag}}
             <a href {{action "edit"}} class="edit-tag" title={{i18n "tagging.edit_tag"}}>{{d-icon "pencil-alt"}}</a>
           {{/if}}
         </div>
         <div class="tag-description-wrapper">
-          {{tagInfo.description}}
+          {{this.tagInfo.description}}
         </div>
       {{/if}}
     </div>
     <div class="tag-associations">
-      {{#if tagInfo.tag_group_names}}
-        {{tagGroupsInfo}}
+      {{#if this.tagInfo.tag_group_names}}
+        {{this.tagGroupsInfo}}
       {{/if}}
-      {{#if tagInfo.categories}}
-        {{categoriesInfo}}
+      {{#if this.tagInfo.categories}}
+        {{this.categoriesInfo}}
         <br>
-        {{#each tagInfo.categories as |category|}}
+        {{#each this.tagInfo.categories as |category|}}
           {{category-link category}}
         {{/each}}
       {{/if}}
-      {{#if nothingToShow}}
-        {{#if tagInfo.category_restricted}}
+      {{#if this.nothingToShow}}
+        {{#if this.tagInfo.category_restricted}}
           {{i18n "tagging.category_restricted"}}
         {{else}}
           {{html-safe (i18n "tagging.default_info")}}
-          {{#if canAdminTag}}
+          {{#if this.canAdminTag}}
             {{html-safe (i18n "tagging.staff_info" basePath=(base-path))}}
           {{/if}}
         {{/if}}
       {{/if}}
     </div>
-    {{#if tagInfo.synonyms}}
+    {{#if this.tagInfo.synonyms}}
       <div class="synonyms-list">
         <h3>{{i18n "tagging.synonyms"}}</h3>
-        <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=tagInfo.name)}}</div>
+        <div>{{html-safe (i18n "tagging.synonyms_description" base_tag_name=this.tagInfo.name)}}</div>
         <div class="tag-list">
-          {{#each tagInfo.synonyms as |tag|}}
+          {{#each this.tagInfo.synonyms as |tag|}}
             <div class="tag-box">
               {{discourse-tag tag.id pmOnly=tag.pmOnly tagName="div"}}
-              {{#if editSynonymsMode}}
+              {{#if this.editSynonymsMode}}
                 <a href {{action "unlinkSynonym" tag}} class="unlink-synonym">
                   {{d-icon "unlink" title="tagging.remove_synonym"}}
                 </a>
@@ -68,26 +68,26 @@
         </div>
       </div>
     {{/if}}
-    {{#if editSynonymsMode}}
+    {{#if this.editSynonymsMode}}
       <section class="add-synonyms field">
         <label for="add-synonyms">{{i18n "tagging.add_synonyms_label"}}</label>
         <div>
-          <TagChooser @id="add-synonyms" @tags={{newSynonyms}} @blockedTags={{array tagInfo.name}} @everyTag={{true}} @excludeSynonyms={{true}} @excludeHasSynonyms={{true}} @unlimitedTagCount={{true}} />
-          <DButton @class="ok" @action={{action "addSynonyms"}} @disabled={{addSynonymsDisabled}} @icon="check" />
+          <TagChooser @id="add-synonyms" @tags={{this.newSynonyms}} @blockedTags={{array this.tagInfo.name}} @everyTag={{true}} @excludeSynonyms={{true}} @excludeHasSynonyms={{true}} @unlimitedTagCount={{true}} />
+          <DButton @class="ok" @action={{action "addSynonyms"}} @disabled={{this.addSynonymsDisabled}} @icon="check" />
         </div>
       </section>
     {{/if}}
-    {{#if canAdminTag}}
-      <PluginOutlet @name="tag-custom-settings" @args={{hash tag=tagInfo}} @tagName="section" />
+    {{#if this.canAdminTag}}
+      <PluginOutlet @name="tag-custom-settings" @args={{hash tag=this.tagInfo}} @tagName="section" />
       <div class="tag-actions">
         <DButton @class="btn-default" @action={{action "toggleEditControls"}} @icon="cog" @label="tagging.edit_synonyms" @id="edit-synonyms" />
-        {{#if deleteAction}}
+        {{#if this.deleteAction}}
           <DButton @class="btn-danger delete-tag" @action={{action "deleteTag"}} @icon="far-trash-alt" @label="tagging.delete_tag" @id="delete-tag" />
         {{/if}}
       </div>
     {{/if}}
   {{/if}}
-  {{#if loading}}
+  {{#if this.loading}}
     <div>{{i18n "loading"}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
index 7a2b3c02a87..eb3e459841a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
@@ -1,15 +1,15 @@
-{{#if title}}
-  <h3>{{title}}</h3>
+{{#if this.title}}
+  <h3>{{this.title}}</h3>
 {{/if}}
-{{#if category}}
-  <CategoryTitleLink @category={{category}} />
+{{#if this.category}}
+  <CategoryTitleLink @category={{this.category}} />
 {{/if}}
-{{#if tagGroupName}}
-  <h3>{{tagGroupName}}</h3>
+{{#if this.tagGroupName}}
+  <h3>{{this.tagGroupName}}</h3>
 {{/if}}
-{{#each sortedTags as |tag|}}
+{{#each this.sortedTags as |tag|}}
   <div class="tag-box">
-    {{discourse-tag tag.id description=tag.description isPrivateMessage=isPrivateMessage pmOnly=tag.pmOnly tagsForUser=tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
+    {{discourse-tag tag.id description=tag.description isPrivateMessage=this.isPrivateMessage pmOnly=tag.pmOnly tagsForUser=this.tagsForUser}} {{#if tag.pmOnly}}{{d-icon "far-envelope"}}{{/if}}{{#if tag.totalCount}} <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
   </div>
 {{/each}}
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
index 1789711e151..d017982576a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tap-tile.hbs
@@ -1,4 +1,4 @@
-{{#if icon}}
-  {{d-icon icon}}
+{{#if this.icon}}
+  {{d-icon this.icon}}
 {{/if}}
 {{ yield }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs b/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
index 3606bb98a04..c9e1969206e 100644
--- a/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/text-overflow.hbs
@@ -1 +1 @@
-{{html-safe text}}
+{{html-safe this.text}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-input.hbs b/app/assets/javascripts/discourse/app/templates/components/time-input.hbs
index 9d6103a3b56..086f899509b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/time-input.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/time-input.hbs
@@ -1,4 +1,4 @@
-<ComboBox @value={{time}} @content={{timeOptions}} @onChange={{action "onChangeTime"}} @options={{hash
+<ComboBox @value={{this.time}} @content={{this.timeOptions}} @onChange={{action "onChangeTime"}} @options={{hash
     translatedNone="--:--"
     allowAny=true
     filterable=false
diff --git a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
index 1df2609c7be..ba303f5b449 100644
--- a/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/time-shortcut-picker.hbs
@@ -1,5 +1,5 @@
-<TapTileGrid @activeTile={{selectedShortcut}} as |grid|>
-  {{#each options as |option|}}
+<TapTileGrid @activeTile={{this.selectedShortcut}} as |grid|>
+  {{#each this.options as |option|}}
     {{#unless option.hidden}}
       <TapTile @icon={{option.icon}} @tileId={{option.id}} @activeTile={{grid.activeTile}} @onChange={{action "selectShortcut"}}>
         <div class="tap-tile-title">{{i18n option.label}}</div>
@@ -8,15 +8,15 @@
     {{/unless}}
 
     {{#if option.isCustomTimeShortcut}}
-      {{#if customDatetimeSelected}}
+      {{#if this.customDatetimeSelected}}
         <div class="control-group custom-date-time-wrap custom-input-wrap">
           <div class="tap-tile-date-input">
             {{d-icon "calendar-alt"}}
-            <DatePickerFuture @value={{customDate}} @onSelect={{action (mut customDate)}} @id="custom-date" />
+            <DatePickerFuture @value={{this.customDate}} @onSelect={{action (mut this.customDate)}} @id="custom-date" />
           </div>
           <div class="tap-tile-time-input">
             {{d-icon "far-clock"}}
-            <Input placeholder="--:--" @id="custom-time" @type="time" class="time-input" @value={{customTime}} />
+            <Input placeholder="--:--" @id="custom-time" @type="time" class="time-input" @value={{this.customTime}} />
           </div>
         </div>
         <div class="control-group custom-date-time-wrap custom-relative-wrap">
diff --git a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
index 4f4898e1691..d72b5da13d8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/top-period-buttons.hbs
@@ -1,3 +1,3 @@
-{{#each periods as |p|}}
+{{#each this.periods as |p|}}
   <DButton @action={{action "changePeriod"}} @class="btn-default" @actionParam={{p}} @translatedLabel={{period-title p}} />
 {{/each}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
index 27bd49073e5..abd86795afc 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-category.hbs
@@ -1,15 +1,15 @@
-{{#unless topic.isPrivateMessage}}
-  {{bound-category-link topic.category recursive=true hideParent=true}}
+{{#unless this.topic.isPrivateMessage}}
+  {{bound-category-link this.topic.category recursive=true hideParent=true}}
 {{/unless}}
 <div class="topic-header-extra">
-  {{#if siteSettings.tagging_enabled}}
+  {{#if this.siteSettings.tagging_enabled}}
     <div class="list-tags">
-      {{discourse-tags topic mode="list" tags=topic.tags}}
+      {{discourse-tags this.topic mode="list" tags=this.topic.tags}}
     </div>
   {{/if}}
-  {{#if siteSettings.topic_featured_link_enabled}}
-    {{topic-featured-link topic}}
+  {{#if this.siteSettings.topic_featured_link_enabled}}
+    {{topic-featured-link this.topic}}
   {{/if}}
 </div>
 
-<PluginOutlet @name="topic-category" @tagName="span" @connectorTagName="div" @args={{hash topic=topic category=topic.category}} />
+<PluginOutlet @name="topic-category" @tagName="span" @connectorTagName="div" @args={{hash topic=this.topic category=this.topic.category}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs
index cf3474e3cbd..7fdc97f3029 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-dismiss-buttons.hbs
@@ -1,10 +1,10 @@
-{{#if showBasedOnPosition}}
-  <div class="row {{containerClass}}">
-    {{#if showDismissRead}}
-      <DButton @class="btn-default dismiss-read" @id={{dismissReadId}} @action={{action "dismissReadPosts"}} @translatedLabel={{dismissLabel}} @title="topics.bulk.dismiss_tooltip" />
+{{#if this.showBasedOnPosition}}
+  <div class="row {{this.containerClass}}">
+    {{#if this.showDismissRead}}
+      <DButton @class="btn-default dismiss-read" @id={{this.dismissReadId}} @action={{action "dismissReadPosts"}} @translatedLabel={{this.dismissLabel}} @title="topics.bulk.dismiss_tooltip" />
     {{/if}}
-    {{#if showResetNew}}
-      <DButton @class="btn-default dismiss-read" @id={{dismissNewId}} @action={{resetNew}} @icon="check" @translatedLabel={{dismissNewLabel}} />
+    {{#if this.showResetNew}}
+      <DButton @class="btn-default dismiss-read" @id={{this.dismissNewId}} @action={{this.resetNew}} @icon="check" @translatedLabel={{this.dismissNewLabel}} />
     {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
index 7e550e6e700..b328f8f5ee9 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-entrance.hbs
@@ -1,7 +1,7 @@
 <DButton @action={{action "enterTop"}} @class="btn-default full jump-top" @ariaLabel="topic_entrance.sr_jump_top_button">
-  {{d-icon "step-backward"}} {{html-safe topDate}}
+  {{d-icon "step-backward"}} {{html-safe this.topDate}}
 </DButton>
 
 <DButton @action={{action "enterBottom"}} @class="btn-default full jump-bottom" @ariaLabel="topic_entrance.sr_jump_bottom_button">
-  {{html-safe bottomDate}} {{d-icon "step-forward"}}
+  {{html-safe this.bottomDate}} {{d-icon "step-forward"}}
 </DButton>
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
index 1801b696d3d..5df744c1df1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-footer-buttons.hbs
@@ -1,11 +1,11 @@
 <div class="topic-footer-main-buttons">
-  <TopicAdminMenuButton @topic={{topic}} @openUpwards="true" @toggleMultiSelect={{toggleMultiSelect}} @showTopicSlowModeUpdate={{showTopicSlowModeUpdate}} @deleteTopic={{deleteTopic}} @recoverTopic={{recoverTopic}} @toggleFeaturedOnProfile={{toggleFeaturedOnProfile}} @toggleClosed={{toggleClosed}} @toggleArchived={{toggleArchived}} @toggleVisibility={{toggleVisibility}} @showTopicTimerModal={{showTopicTimerModal}} @showFeatureTopic={{showFeatureTopic}} @showChangeTimestamp={{showChangeTimestamp}} @resetBumpDate={{resetBumpDate}} @convertToPublicTopic={{convertToPublicTopic}} @convertToPrivateMessage={{convertToPrivateMessage}} />
+  <TopicAdminMenuButton @topic={{this.topic}} @openUpwards="true" @toggleMultiSelect={{this.toggleMultiSelect}} @showTopicSlowModeUpdate={{this.showTopicSlowModeUpdate}} @deleteTopic={{this.deleteTopic}} @recoverTopic={{this.recoverTopic}} @toggleFeaturedOnProfile={{this.toggleFeaturedOnProfile}} @toggleClosed={{this.toggleClosed}} @toggleArchived={{this.toggleArchived}} @toggleVisibility={{this.toggleVisibility}} @showTopicTimerModal={{this.showTopicTimerModal}} @showFeatureTopic={{this.showFeatureTopic}} @showChangeTimestamp={{this.showChangeTimestamp}} @resetBumpDate={{this.resetBumpDate}} @convertToPublicTopic={{this.convertToPublicTopic}} @convertToPrivateMessage={{this.convertToPrivateMessage}} />
 
-  {{#if site.mobileView}}
-    <TopicFooterMobileDropdown @topic={{topic}} @content={{dropdownButtons}} />
+  {{#if this.site.mobileView}}
+    <TopicFooterMobileDropdown @topic={{this.topic}} @content={{this.dropdownButtons}} />
   {{/if}}
 
-  {{#each inlineActionables as |actionable|}}
+  {{#each this.inlineActionables as |actionable|}}
     {{#if (eq actionable.type "inline-button")}}
       <DButton @id={{concat "topic-footer-button-" actionable.id}} @class={{concat "btn-default topic-footer-button " actionable.classNames}} @action={{actionable.action}} @icon={{actionable.icon}} @translatedLabel={{actionable.label}} @translatedTitle={{actionable.title}} @translatedAriaLabel={{actionable.ariaLabel}} @disabled={{actionable.disabled}} />
     {{else}}
@@ -17,19 +17,19 @@
     {{/if}}
   {{/each}}
 
-  <PluginOutlet @name="topic-footer-main-buttons-before-create" @args={{hash topic=topic}} @connectorTagName="span" />
+  <PluginOutlet @name="topic-footer-main-buttons-before-create" @args={{hash topic=this.topic}} @connectorTagName="span" />
 
-  {{#if topic.details.can_create_post}}
-    <DButton @class="btn-primary create" @icon="reply" @action={{replyToPost}} @label="topic.reply.title" @title="topic.reply.help" />
+  {{#if this.topic.details.can_create_post}}
+    <DButton @class="btn-primary create" @icon="reply" @action={{this.replyToPost}} @label="topic.reply.title" @title="topic.reply.help" />
   {{/if}}
 
-  <PluginOutlet @name="after-topic-footer-main-buttons" @args={{hash topic=topic}} @connectorTagName="span" />
+  <PluginOutlet @name="after-topic-footer-main-buttons" @args={{hash topic=this.topic}} @connectorTagName="span" />
 </div>
 
-<PinnedButton @pinned={{topic.pinned}} @topic={{topic}} />
+<PinnedButton @pinned={{this.topic.pinned}} @topic={{this.topic}} />
 
-{{#if showNotificationsButton}}
-  <TopicNotificationsButton @notificationLevel={{topic.details.notification_level}} @topic={{topic}} />
+{{#if this.showNotificationsButton}}
+  <TopicNotificationsButton @notificationLevel={{this.topic.details.notification_level}} @topic={{this.topic}} />
 {{/if}}
 
-<PluginOutlet @name="after-topic-footer-buttons" @args={{hash topic=topic}} @connectorTagName="span" />
+<PluginOutlet @name="after-topic-footer-buttons" @args={{hash topic=this.topic}} @connectorTagName="span" />
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
index 556c0177f92..88c36a91df8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-list-item.hbs
@@ -1 +1 @@
-{{topicListItemContents}}
+{{this.topicListItemContents}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
index 33cf78b13c1..3eadf3f1e5a 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-list.hbs
@@ -1,42 +1,42 @@
-{{#unless skipHeader}}
+{{#unless this.skipHeader}}
   <thead class="topic-list-header">
     {{raw "topic-list-header"
-      canBulkSelect=canBulkSelect
-      toggleInTitle=toggleInTitle
-      hideCategory=hideCategory
-      showPosters=showPosters
-      showLikes=showLikes
-      showOpLikes=showOpLikes
-      order=order
-      ascending=ascending
-      sortable=sortable
-      listTitle=listTitle
-      bulkSelectEnabled=bulkSelectEnabled
-      canDoBulkActions=canDoBulkActions
+      canBulkSelect=this.canBulkSelect
+      toggleInTitle=this.toggleInTitle
+      hideCategory=this.hideCategory
+      showPosters=this.showPosters
+      showLikes=this.showLikes
+      showOpLikes=this.showOpLikes
+      order=this.order
+      ascending=this.ascending
+      sortable=this.sortable
+      listTitle=this.listTitle
+      bulkSelectEnabled=this.bulkSelectEnabled
+      canDoBulkActions=this.canDoBulkActions
     }}
   </thead>
 {{/unless}}
 
 <PluginOutlet @name="before-topic-list-body" @args={{hash
-    topics=topics
-    selected=selected
-    bulkSelectEnabled=bulkSelectEnabled
-    lastVisitedTopic=lastVisitedTopic
-    discoveryList=discoveryList
-    hideCategory=hideCategory}} />
+    topics=this.topics
+    selected=this.selected
+    bulkSelectEnabled=this.bulkSelectEnabled
+    lastVisitedTopic=this.lastVisitedTopic
+    discoveryList=this.discoveryList
+    hideCategory=this.hideCategory}} />
 
 <tbody class="topic-list-body">
-  {{#each filteredTopics as |topic index|}}
-    <TopicListItem @topic={{topic}} @bulkSelectEnabled={{bulkSelectEnabled}} @showTopicPostBadges={{showTopicPostBadges}} @hideCategory={{hideCategory}} @showPosters={{showPosters}} @showLikes={{showLikes}} @showOpLikes={{showOpLikes}} @expandGloballyPinned={{expandGloballyPinned}} @expandAllPinned={{expandAllPinned}} @lastVisitedTopic={{lastVisitedTopic}} @selected={{selected}} @lastChecked={{lastChecked}} @tagsForUser={{tagsForUser}} @focusLastVisitedTopic={{focusLastVisitedTopic}} @index={{index}} />
-    {{raw "list/visited-line" lastVisitedTopic=lastVisitedTopic topic=topic}}
+  {{#each this.filteredTopics as |topic index|}}
+    <TopicListItem @topic={{topic}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @showTopicPostBadges={{this.showTopicPostBadges}} @hideCategory={{this.hideCategory}} @showPosters={{this.showPosters}} @showLikes={{this.showLikes}} @showOpLikes={{this.showOpLikes}} @expandGloballyPinned={{this.expandGloballyPinned}} @expandAllPinned={{this.expandAllPinned}} @lastVisitedTopic={{this.lastVisitedTopic}} @selected={{this.selected}} @lastChecked={{this.lastChecked}} @tagsForUser={{this.tagsForUser}} @focusLastVisitedTopic={{this.focusLastVisitedTopic}} @index={{index}} />
+    {{raw "list/visited-line" lastVisitedTopic=this.lastVisitedTopic topic=topic}}
     <PluginOutlet @name="after-topic-list-item" @args={{hash topic=topic index=index}} @connectorTagName="tr" />
   {{/each}}
 </tbody>
 
 <PluginOutlet @name="after-topic-list-body" @args={{hash
-    topics=topics
-    selected=selected
-    bulkSelectEnabled=bulkSelectEnabled
-    lastVisitedTopic=lastVisitedTopic
-    discoveryList=discoveryList
-    hideCategory=hideCategory}} />
+    topics=this.topics
+    selected=this.selected
+    bulkSelectEnabled=this.bulkSelectEnabled
+    lastVisitedTopic=this.lastVisitedTopic
+    discoveryList=this.discoveryList
+    hideCategory=this.hideCategory}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs
index 7a859f4538d..023eb65bd73 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-navigation-popup.hbs
@@ -1,4 +1,4 @@
-{{#unless hidden}}
+{{#unless this.hidden}}
   <div class="topic-navigation-popup">
     <DButton @action={{action "close"}} @class="close btn-flat" @icon="times" />
     {{yield}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
index 98ec8b7552d..ffd6847a853 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-navigation.hbs
@@ -1,3 +1,3 @@
-{{#if canRender}}
-  {{yield info}}
+{{#if this.canRender}}
+  {{yield this.info}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
index 9a0f0ff4109..8162e15e5c0 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-post-badges.hbs
@@ -1,6 +1,6 @@
-{{#if displayUnreadPosts}}
-  &nbsp;<a href={{url}} title={{i18n "topic.unread_posts" count=displayUnreadPosts}} class="badge badge-notification unread-posts">{{displayUnreadPosts}}</a>
+{{#if this.displayUnreadPosts}}
+  &nbsp;<a href={{this.url}} title={{i18n "topic.unread_posts" count=this.displayUnreadPosts}} class="badge badge-notification unread-posts">{{this.displayUnreadPosts}}</a>
 {{/if}}
-{{#if unseen}}
-  &nbsp;<a href={{url}} title={{i18n "topic.new"}} class="badge badge-notification new-topic">{{newDotText}}</a>
+{{#if this.unseen}}
+  &nbsp;<a href={{this.url}} title={{i18n "topic.new"}} class="badge badge-notification new-topic">{{this.newDotText}}</a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
index 1574c1d0296..cd1c3dda325 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-progress.hbs
@@ -1,19 +1,19 @@
-{{#unless hideProgress}}
+{{#unless this.hideProgress}}
   {{yield}}
 {{/unless}}
 
-{{#if showBackButton}}
+{{#if this.showBackButton}}
   <div class="progress-back-container">
     <DButton @label="topic.timeline.back" @class="btn-primary progress-back" @action={{action "goBack"}} @icon="arrow-down" />
   </div>
 {{/if}}
 
-<nav title={{i18n "topic.progress.title"}} class={{if hideProgress "hidden"}} id="topic-progress" style={{html-safe progressStyle}}>
+<nav title={{i18n "topic.progress.title"}} class={{if this.hideProgress "hidden"}} id="topic-progress" style={{html-safe this.progressStyle}}>
   <div class="nums">
-    <h4>{{progressPosition}}</h4>
-    <span class={{if hugeNumberOfPosts "hidden"}}>
+    <h4>{{this.progressPosition}}</h4>
+    <span class={{if this.hugeNumberOfPosts "hidden"}}>
       <span>/</span>
-      <h4>{{postStream.filteredPostsCount}}</h4>
+      <h4>{{this.postStream.filteredPostsCount}}</h4>
     </span>
   </div>
   <div class="bg"></div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
index 6f53c219bba..ca225ac0d8c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-status.hbs
@@ -1,33 +1,33 @@
-{{~#if topicClosedArchived~}}
-  <span title={{closedArchivedTitle}} class="topic-status">{{closedArchivedIcon}}</span>
+{{~#if this.topicClosedArchived~}}
+  <span title={{this.closedArchivedTitle}} class="topic-status">{{this.closedArchivedIcon}}</span>
 {{~/if~}}
-{{~#if closedIcon~}}
-  <span title={{closedTitle}} class="topic-status">{{closedIcon}}</span>
+{{~#if this.closedIcon~}}
+  <span title={{this.closedTitle}} class="topic-status">{{this.closedIcon}}</span>
 {{~/if~}}
-{{~#if archivedIcon~}}
-  <span title={{archivedTitle}} class="topic-status">{{archivedIcon}}</span>
+{{~#if this.archivedIcon~}}
+  <span title={{this.archivedTitle}} class="topic-status">{{this.archivedIcon}}</span>
 {{~/if~}}
-{{~#if topicPrivateMessage~}}
-  <span title={{privateMessageTitle}} class="topic-status">{{privateMessageIcon}}</span>
+{{~#if this.topicPrivateMessage~}}
+  <span title={{this.privateMessageTitle}} class="topic-status">{{this.privateMessageIcon}}</span>
 {{~/if~}}
-{{~#if topicWarning~}}
-  <span title={{warningTitle}} class="topic-status topic-status-warning">{{warningIcon}}</span>
+{{~#if this.topicWarning~}}
+  <span title={{this.warningTitle}} class="topic-status topic-status-warning">{{this.warningIcon}}</span>
 {{~/if~}}
-{{~#if topicPinned~}}
-  {{~#if canAct~}}
-    <a href="" title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</a>
+{{~#if this.topicPinned~}}
+  {{~#if this.canAct~}}
+    <a href="" title={{this.pinnedTitle}} class="topic-status">{{this.pinnedIcon}}</a>
   {{~else~}}
-    <span title={{pinnedTitle}} class="topic-status">{{pinnedIcon}}</span>
+    <span title={{this.pinnedTitle}} class="topic-status">{{this.pinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
-{{~#if topicUnpinned~}}
-  {{~#if canAct~}}
-    <a href="" title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</a>
+{{~#if this.topicUnpinned~}}
+  {{~#if this.canAct~}}
+    <a href="" title={{this.unpinnedTitle}} class="topic-status">{{this.unpinnedIcon}}</a>
   {{~else~}}
-    <span title={{unpinnedTitle}} class="topic-status">{{unpinnedIcon}}</span>
+    <span title={{this.unpinnedTitle}} class="topic-status">{{this.unpinnedIcon}}</span>
   {{~/if~}}
 {{~/if~}}
-{{~#if topicInvisible~}}
-  <span title={{invisibleTitle}} class="topic-status">{{invisibleIcon}}</span>
+{{~#if this.topicInvisible~}}
+  <span title={{this.invisibleTitle}} class="topic-status">{{this.invisibleIcon}}</span>
 {{~/if~}}
-<PluginOutlet @name="after-topic-status" @connectorTagName="div" @args={{hash topic=topic}} />
+<PluginOutlet @name="after-topic-status" @connectorTagName="div" @args={{hash topic=this.topic}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
index 15cbdaff173..e3252d0286b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-timer-info.hbs
@@ -1,14 +1,14 @@
-{{#if showTopicTimer}}
+{{#if this.showTopicTimer}}
   <h3 class="topic-timer-heading">
-    <span title={{title}}>
-      {{clockIcon}} {{notice}}
+    <span title={{this.title}}>
+      {{this.clockIcon}} {{this.notice}}
     </span>
     <div class="topic-timer-modify">
-      {{#if showEdit}}
-        <DButton @title="post.controls.edit_timer" @icon="pencil-alt" @class="btn topic-timer-edit no-text" @action={{showTopicTimerModal}} />
+      {{#if this.showEdit}}
+        <DButton @title="post.controls.edit_timer" @icon="pencil-alt" @class="btn topic-timer-edit no-text" @action={{this.showTopicTimerModal}} />
       {{/if}}
-      {{#if showTrashCan}}
-        <DButton @title="post.controls.remove_timer" @icon="trash-alt" @class="btn topic-timer-remove no-text" @action={{removeTopicTimer}} />
+      {{#if this.showTrashCan}}
+        <DButton @title="post.controls.remove_timer" @icon="trash-alt" @class="btn topic-timer-remove no-text" @action={{this.removeTopicTimer}} />
       {{/if}}
     </div>
   </h3>
diff --git a/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs b/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
index aa418dff106..7f107a6265b 100644
--- a/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/topic-title.hbs
@@ -2,5 +2,5 @@
   <div class="title-wrapper">
     {{yield}}
   </div>
-  <PluginOutlet @name="topic-title" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+  <PluginOutlet @name="topic-title" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs b/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
index 2d7c73231c7..a8e5846b440 100644
--- a/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/track-selected.hbs
@@ -1 +1 @@
-<Input @type="checkbox" @checked={{selected}} />
+<Input @type="checkbox" @checked={{this.selected}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs
index e4e8304b520..bd7c453861c 100644
--- a/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/uppy-backup-uploader.hbs
@@ -1,4 +1,4 @@
-<label class="btn" disabled={{uploading}} title={{i18n "admin.backups.upload.title"}}>
-  {{d-icon "upload"}}{{uploadButtonText}}
-  <input class="hidden-upload-field" disabled={{uploading}} type="file" accept=".gz">
+<label class="btn" disabled={{this.uploading}} title={{i18n "admin.backups.upload.title"}}>
+  {{d-icon "upload"}}{{this.uploadButtonText}}
+  <input class="hidden-upload-field" disabled={{this.uploading}} type="file" accept=".gz">
 </label>
diff --git a/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs b/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
index 50a3314eb6a..7fe9d0626ab 100644
--- a/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/uppy-image-uploader.hbs
@@ -1,32 +1,32 @@
-<div class="uploaded-image-preview input-xxlarge" style={{backgroundStyle}}>
-  {{#if showingPlaceholder}}
-    <div class="placeholder-overlay" style={{placeholderStyle}}></div>
+<div class="uploaded-image-preview input-xxlarge" style={{this.backgroundStyle}}>
+  {{#if this.showingPlaceholder}}
+    <div class="placeholder-overlay" style={{this.placeholderStyle}}></div>
   {{/if}}
   <div class="image-upload-controls">
-    <label class="btn btn-default pad-left no-text {{if uploadingOrProcessing "disabled"}}">
+    <label class="btn btn-default pad-left no-text {{if this.uploadingOrProcessing "disabled"}}">
       {{d-icon "far-image"}}
-      <PickFilesButton @fileInputDisabled={{uploadingOrProcessing}} @fileInputClass="hidden-upload-field" @acceptedFormatsOverride="image/*" />
+      <PickFilesButton @fileInputDisabled={{this.uploadingOrProcessing}} @fileInputClass="hidden-upload-field" @acceptedFormatsOverride="image/*" />
     </label>
 
-    {{#if imageUrl}}
+    {{#if this.imageUrl}}
       <DButton @action={{action "trash"}} @class="btn-danger pad-left no-text" @icon="far-trash-alt" @type="button" />
 
-      <DButton @icon="discourse-expand" @title="expand" @type="button" @class="image-uploader-lightbox-btn no-text" @action={{action "toggleLightbox"}} @disabled={{loadingLightbox}} />
+      <DButton @icon="discourse-expand" @title="expand" @type="button" @class="image-uploader-lightbox-btn no-text" @action={{action "toggleLightbox"}} @disabled={{this.loadingLightbox}} />
     {{/if}}
 
-    <span class="btn {{unless uploading "hidden"}}">{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
-    <span class="btn {{unless processing "hidden"}}">{{i18n "upload_selector.processing"}}</span>
+    <span class="btn {{unless this.uploading "hidden"}}">{{i18n "upload_selector.uploading"}} {{this.uploadProgress}}%</span>
+    <span class="btn {{unless this.processing "hidden"}}">{{i18n "upload_selector.processing"}}</span>
   </div>
 
-  {{#if imageUrl}}
+  {{#if this.imageUrl}}
     <a class="lightbox"
-       href={{imageCDNURL}}
-       title={{imageFilename}}
+       href={{this.imageCDNURL}}
+       title={{this.imageFilename}}
        rel="nofollow ugc noopener">
 
       <div class="meta">
         <span class="informations">
-          {{imageWidth}}x{{imageHeight}} {{imageFilesize}}
+          {{this.imageWidth}}x{{this.imageHeight}} {{this.imageFilesize}}
         </span>
       </div>
     </a>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs b/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs
index 6cfdaa4e287..18af83826b1 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-avatar-flair.hbs
@@ -1,3 +1,3 @@
-{{#if flair}}
-  <AvatarFlair @flairName={{flair.flairName}} @flairUrl={{flair.flairUrl}} @flairBgColor={{flair.flairBgColor}} @flairColor={{flair.flairColor}} />
+{{#if this.flair}}
+  <AvatarFlair @flairName={{this.flair.flairName}} @flairUrl={{this.flair.flairUrl}} @flairBgColor={{this.flair.flairBgColor}} @flairColor={{this.flair.flairColor}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
index 0d9d1615b72..2a288157d56 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-card-contents.hbs
@@ -165,7 +165,7 @@
                 <span>{{this.user.location}}</span>
               </span>
             {{/if}}
-            {{#if showUserLocalTime}}
+            {{#if this.showUserLocalTime}}
               <span class="local-time" title="{{i18n "local_time"}}">
                 {{d-icon "far-clock"}}
                 <span>{{this.formattedUserLocalTime}}</span>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
index e0bf9b0ea97..86f9aab1eff 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-info.hbs
@@ -1,4 +1,4 @@
-{{#if includeAvatar}}
+{{#if this.includeAvatar}}
   <div class="user-image">
     <div class="user-image-inner">
       <a href={{this.userPath}} data-user-card={{@user.username}}>{{avatar @user imageSize="large"}}</a>
@@ -9,25 +9,25 @@
 
 <div class="user-detail">
   <div class="name-line">
-    <span class={{if nameFirst "name bold" "username bold"}}>
-      {{#if includeLink}}
+    <span class={{if this.nameFirst "name bold" "username bold"}}>
+      {{#if this.includeLink}}
         <a href={{this.userPath}} data-user-card={{@user.username}}>
-          {{if nameFirst @user.name (format-username @user.username)}}
+          {{if this.nameFirst @user.name (format-username @user.username)}}
         </a>
       {{else}}
-        {{if nameFirst @user.name (format-username @user.username)}}
+        {{if this.nameFirst @user.name (format-username @user.username)}}
       {{/if}}
     </span>
-    <span class={{if nameFirst "username margin" "name margin"}}>
-      {{#if includeLink}}
+    <span class={{if this.nameFirst "username margin" "name margin"}}>
+      {{#if this.includeLink}}
         <a href={{this.userPath}} data-user-card={{@user.username}}>
-          {{if nameFirst (format-username @user.username) @user.name}}
+          {{if this.nameFirst (format-username @user.username) @user.name}}
         </a>
       {{else}}
-        {{if nameFirst (format-username @user.username) @user.name}}
+        {{if this.nameFirst (format-username @user.username) @user.name}}
       {{/if}}
     </span>
-    <PluginOutlet @name="after-user-name" @tagName="span" @connectorTagName="span" @args={{hash user=user}} />
+    <PluginOutlet @name="after-user-name" @tagName="span" @connectorTagName="span" @args={{hash user=this.user}} />
   </div>
   <div class="title">{{@user.title}}</div>
 
@@ -39,4 +39,4 @@
 
 </div>
 
-<PluginOutlet @name="after-user-info" @tagName="span" @connectorTagName="div" @args={{hash user=user}} />
+<PluginOutlet @name="after-user-info" @tagName="span" @connectorTagName="div" @args={{hash user=this.user}} />
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
index cbf03f76ac4..3c35a3f7a97 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule-day.hbs
@@ -1,12 +1,12 @@
-<tr class="day {{dayLabel}}">
-  <td class="day-label">{{dayLabel}}</td>
+<tr class="day {{this.dayLabel}}">
+  <td class="day-label">{{this.dayLabel}}</td>
   <td class="starts-at">
-    <ComboBox @valueProperty="value" @content={{startTimeOptions}} @value={{startTimeValue}} @onChange={{onChangeStartTime}} />
+    <ComboBox @valueProperty="value" @content={{this.startTimeOptions}} @value={{this.startTimeValue}} @onChange={{this.onChangeStartTime}} />
   </td>
-  {{#if endTimeOptions}}
+  {{#if this.endTimeOptions}}
     <td class="to">{{i18n "user.notification_schedule.to"}}</td>
     <td class="ends-at">
-      <ComboBox @valueProperty="value" @content={{endTimeOptions}} @value={{endTimeValue}} @onChange={{onChangeEndTime}} />
+      <ComboBox @valueProperty="value" @content={{this.endTimeOptions}} @value={{this.endTimeValue}} @onChange={{this.onChangeEndTime}} />
     </td>
   {{/if}}
 </tr>
diff --git a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
index f06312b45e6..31fadcad668 100644
--- a/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/user-notification-schedule.hbs
@@ -1,13 +1,13 @@
 <div class="control-group notification-schedule">
   <label class="control-label">{{i18n "user.notification_schedule.title"}}</label>
-  <PreferenceCheckbox @labelKey="user.notification_schedule.label" @checked={{model.user_notification_schedule.enabled}} />
+  <PreferenceCheckbox @labelKey="user.notification_schedule.label" @checked={{this.model.user_notification_schedule.enabled}} />
 
-  {{#if model.user_notification_schedule.enabled}}
+  {{#if this.model.user_notification_schedule.enabled}}
     <div class="instruction">{{i18n "user.notification_schedule.tip"}}</div>
 
     <table class="notification-schedule-table">
       <tbody class="notification-schedule-tbody">
-        {{#each days as |day|}}
+        {{#each this.days as |day|}}
           <UserNotificationScheduleDay @day={{day.day}} @startTimeOptions={{day.startTimeOptions}} @startTimeValue={{day.startTimeValue}} @onChangeStartTime={{day.onChangeStartTime}} @endTimeOptions={{day.endTimeOptions}} @endTimeValue={{day.endTimeValue}} @onChangeEndTime={{day.onChangeEndTime}} />
         {{/each}}
       </tbody>
diff --git a/app/assets/javascripts/discourse/app/templates/composer.hbs b/app/assets/javascripts/discourse/app/templates/composer.hbs
index 3542d7cfd88..47ee856829c 100644
--- a/app/assets/javascripts/discourse/app/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer.hbs
@@ -1,102 +1,102 @@
-<ComposerBody @composer={{model}} @showPreview={{showPreview}} @openIfDraft={{action "openIfDraft"}} @typed={{action "typed"}} @cancelled={{action "cancelled"}} @save={{action "save"}}>
+<ComposerBody @composer={{this.model}} @showPreview={{this.showPreview}} @openIfDraft={{action "openIfDraft"}} @typed={{action "typed"}} @cancelled={{action "cancelled"}} @save={{action "save"}}>
   <div class="grippie"></div>
 
-  {{#if visible}}
-    <ComposerMessages @composer={{model}} @messageCount={{messageCount}} @addLinkLookup={{action "addLinkLookup"}} />
+  {{#if this.visible}}
+    <ComposerMessages @composer={{this.model}} @messageCount={{this.messageCount}} @addLinkLookup={{action "addLinkLookup"}} />
 
-    {{#if model.viewOpenOrFullscreen}}
-      <div role="form" aria-label={{I18n saveLabel}} class="reply-area {{if canEditTags "with-tags" "without-tags"}}">
-        <PluginOutlet @name="composer-open" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+    {{#if this.model.viewOpenOrFullscreen}}
+      <div role="form" aria-label={{I18n this.saveLabel}} class="reply-area {{if this.canEditTags "with-tags" "without-tags"}}">
+        <PluginOutlet @name="composer-open" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
         <div class="reply-to">
-          {{#unless model.viewFullscreen}}
+          {{#unless this.model.viewFullscreen}}
             <div class="reply-details">
-              <ComposerActionTitle @model={{model}} @openComposer={{action "openComposer"}} @closeComposer={{action "closeComposer"}} @canWhisper={{canWhisper}} />
+              <ComposerActionTitle @model={{this.model}} @openComposer={{action "openComposer"}} @closeComposer={{action "closeComposer"}} @canWhisper={{this.canWhisper}} />
 
-              <PluginOutlet @name="composer-action-after" @args={{hash model=model}} />
+              <PluginOutlet @name="composer-action-after" @args={{hash model=this.model}} />
 
-              {{#unless site.mobileView}}
-                {{#if model.unlistTopic}}
+              {{#unless this.site.mobileView}}
+                {{#if this.model.unlistTopic}}
                   <span class="unlist">({{i18n "composer.unlist"}})</span>
                 {{/if}}
-                {{#if isWhispering}}
-                  {{#if model.noBump}}
+                {{#if this.isWhispering}}
+                  {{#if this.model.noBump}}
                     <span class="no-bump">{{d-icon "anchor"}}</span>
                   {{/if}}
                 {{/if}}
               {{/unless}}
 
-              {{#if canEdit}}
-                <LinkToInput @onClick={{action "displayEditReason"}} @showInput={{showEditReason}} @icon="info-circle" @class="display-edit-reason">
-                  <TextField @value={{editReason}} @id="edit-reason" @maxlength="255" @placeholderKey="composer.edit_reason_placeholder" />
+              {{#if this.canEdit}}
+                <LinkToInput @onClick={{action "displayEditReason"}} @showInput={{this.showEditReason}} @icon="info-circle" @class="display-edit-reason">
+                  <TextField @value={{this.editReason}} @id="edit-reason" @maxlength="255" @placeholderKey="composer.edit_reason_placeholder" />
                 </LinkToInput>
               {{/if}}
             </div>
           {{/unless}}
 
-          <PluginOutlet @name="before-composer-controls" @args={{hash model=model}} />
+          <PluginOutlet @name="before-composer-controls" @args={{hash model=this.model}} />
 
-          <ComposerToggles @composeState={{model.composeState}} @showToolbar={{showToolbar}} @toggleComposer={{action "toggle"}} @toggleToolbar={{action "toggleToolbar"}} @toggleFullscreen={{action "fullscreenComposer"}} @disableTextarea={{disableTextarea}} />
+          <ComposerToggles @composeState={{this.model.composeState}} @showToolbar={{this.showToolbar}} @toggleComposer={{action "toggle"}} @toggleToolbar={{action "toggleToolbar"}} @toggleFullscreen={{action "fullscreenComposer"}} @disableTextarea={{this.disableTextarea}} />
         </div>
 
-        <ComposerEditor @topic={{topic}} @composer={{model}} @lastValidatedAt={{lastValidatedAt}} @canWhisper={{canWhisper}} @storeToolbarState={{action "storeToolbarState"}} @onPopupMenuAction={{action "onPopupMenuAction"}} @showUploadModal={{route-action "showUploadSelector"}} @popupMenuOptions={{popupMenuOptions}} @draftStatus={{model.draftStatus}} @isUploading={{isUploading}} @isProcessingUpload={{isProcessingUpload}} @allowUpload={{allowUpload}} @uploadIcon={{uploadIcon}} @isCancellable={{isCancellable}} @uploadProgress={{uploadProgress}} @groupsMentioned={{action "groupsMentioned"}} @cannotSeeMention={{action "cannotSeeMention"}} @hereMention={{action "hereMention"}} @importQuote={{action "importQuote"}} @togglePreview={{action "togglePreview"}} @processPreview={{showPreview}} @showToolbar={{showToolbar}} @afterRefresh={{action "afterRefresh"}} @focusTarget={{focusTarget}} @disableTextarea={{disableTextarea}}>
+        <ComposerEditor @topic={{this.topic}} @composer={{this.model}} @lastValidatedAt={{this.lastValidatedAt}} @canWhisper={{this.canWhisper}} @storeToolbarState={{action "storeToolbarState"}} @onPopupMenuAction={{action "onPopupMenuAction"}} @showUploadModal={{route-action "showUploadSelector"}} @popupMenuOptions={{this.popupMenuOptions}} @draftStatus={{this.model.draftStatus}} @isUploading={{this.isUploading}} @isProcessingUpload={{this.isProcessingUpload}} @allowUpload={{this.allowUpload}} @uploadIcon={{this.uploadIcon}} @isCancellable={{this.isCancellable}} @uploadProgress={{this.uploadProgress}} @groupsMentioned={{action "groupsMentioned"}} @cannotSeeMention={{action "cannotSeeMention"}} @hereMention={{action "hereMention"}} @importQuote={{action "importQuote"}} @togglePreview={{action "togglePreview"}} @processPreview={{this.showPreview}} @showToolbar={{this.showToolbar}} @afterRefresh={{action "afterRefresh"}} @focusTarget={{this.focusTarget}} @disableTextarea={{this.disableTextarea}}>
           <div class="composer-fields">
-            {{#unless model.viewFullscreen}}
-              {{#if model.canEditTitle}}
-                {{#if model.creatingPrivateMessage}}
+            {{#unless this.model.viewFullscreen}}
+              {{#if this.model.canEditTitle}}
+                {{#if this.model.creatingPrivateMessage}}
                   <div class="user-selector">
-                    <ComposerUserSelector @topicId={{topicModel.id}} @recipients={{model.targetRecipients}} @hasGroups={{model.hasTargetGroups}} @focusTarget={{focusTarget}} @class={{concat "users-input" (if showWarning " can-warn")}} />
-                    {{#if showWarning}}
+                    <ComposerUserSelector @topicId={{this.topicModel.id}} @recipients={{this.model.targetRecipients}} @hasGroups={{this.model.hasTargetGroups}} @focusTarget={{this.focusTarget}} @class={{concat "users-input" (if this.showWarning " can-warn")}} />
+                    {{#if this.showWarning}}
                       <label class="add-warning">
-                        <Input @type="checkbox" @checked={{model.isWarning}} />
+                        <Input @type="checkbox" @checked={{this.model.isWarning}} />
                         <span>{{i18n "composer.add_warning"}}</span>
                       </label>
                     {{/if}}
                   </div>
                 {{/if}}
 
-                <div class="title-and-category {{if showPreview "with-preview"}}">
-                  <ComposerTitle @composer={{model}} @lastValidatedAt={{lastValidatedAt}} @focusTarget={{focusTarget}} />
+                <div class="title-and-category {{if this.showPreview "with-preview"}}">
+                  <ComposerTitle @composer={{this.model}} @lastValidatedAt={{this.lastValidatedAt}} @focusTarget={{this.focusTarget}} />
 
-                  {{#if model.showCategoryChooser}}
+                  {{#if this.model.showCategoryChooser}}
                     <div class="category-input">
-                      <CategoryChooser @value={{model.categoryId}} @onChange={{action (mut model.categoryId)}} @options={{hash
-                          disabled=disableCategoryChooser
-                          scopedCategoryId=scopedCategoryId
-                          prioritizedCategoryId=prioritizedCategoryId
+                      <CategoryChooser @value={{this.model.categoryId}} @onChange={{action (mut this.model.categoryId)}} @options={{hash
+                          disabled=this.disableCategoryChooser
+                          scopedCategoryId=this.scopedCategoryId
+                          prioritizedCategoryId=this.prioritizedCategoryId
                         }} />
-                      <PopupInputTip @validation={{categoryValidation}} />
+                      <PopupInputTip @validation={{this.categoryValidation}} />
                     </div>
                   {{/if}}
 
-                  {{#if canEditTags}}
-                    <MiniTagChooser @value={{model.tags}} @onChange={{action (mut model.tags)}} @options={{hash
-                        disabled=disableTagsChooser
-                        categoryId=model.categoryId
-                        minimum=model.minimumRequiredTags
+                  {{#if this.canEditTags}}
+                    <MiniTagChooser @value={{this.model.tags}} @onChange={{action (mut this.model.tags)}} @options={{hash
+                        disabled=this.disableTagsChooser
+                        categoryId=this.model.categoryId
+                        minimum=this.model.minimumRequiredTags
                       }} />
-                    <PopupInputTip @validation={{tagValidation}} />
+                    <PopupInputTip @validation={{this.tagValidation}} />
                   {{/if}}
                 </div>
               {{/if}}
 
-              <PluginOutlet @name="composer-fields" @tagName="span" @connectorTagName="div" @args={{hash model=model showPreview=showPreview}} />
+              <PluginOutlet @name="composer-fields" @tagName="span" @connectorTagName="div" @args={{hash model=this.model showPreview=this.showPreview}} />
             {{/unless}}
           </div>
         </ComposerEditor>
 
-        <PluginOutlet @name="composer-after-composer-editor" @tagName="span" @args={{hash model=model}} />
+        <PluginOutlet @name="composer-after-composer-editor" @tagName="span" @args={{hash model=this.model}} />
 
         <div class="submit-panel">
-          <PluginOutlet @name="composer-fields-below" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+          <PluginOutlet @name="composer-fields-below" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
           <div class="save-or-cancel">
-            {{#unless model.viewFullscreen}}
-              <ComposerSaveButton @action={{action "save"}} @icon={{saveIcon}} @label={{saveLabel}} @forwardEvent={{true}} @disableSubmit={{disableSubmit}} />
+            {{#unless this.model.viewFullscreen}}
+              <ComposerSaveButton @action={{action "save"}} @icon={{this.saveIcon}} @label={{this.saveLabel}} @forwardEvent={{true}} @disableSubmit={{this.disableSubmit}} />
 
-              {{#if site.mobileView}}
+              {{#if this.site.mobileView}}
                 <a href {{action "cancel"}} title={{i18n "cancel"}} class="cancel">
-                  {{#if canEdit}}
+                  {{#if this.canEdit}}
                     {{d-icon "times"}}
                   {{else}}
                     {{d-icon "far-trash-alt"}}
@@ -107,56 +107,56 @@
               {{/if}}
             {{/unless}}
 
-            {{#if site.mobileView}}
-              {{#if whisperOrUnlistTopic}}
+            {{#if this.site.mobileView}}
+              {{#if this.whisperOrUnlistTopic}}
                 <span class="whisper">
                   {{d-icon "far-eye-slash"}}
                 </span>
               {{/if}}
 
-              {{#if model.noBump}}
+              {{#if this.model.noBump}}
                 <span class="no-bump">{{d-icon "anchor"}}</span>
               {{/if}}
             {{/if}}
 
-            {{#if (or isUploading isProcessingUpload)}}
+            {{#if (or this.isUploading this.isProcessingUpload)}}
               <div id="file-uploading">
-                {{#if isProcessingUpload}}
+                {{#if this.isProcessingUpload}}
                   {{loading-spinner size="small"}}<span>{{i18n "upload_selector.processing"}}</span>
                 {{else}}
-                  {{loading-spinner size="small"}}<span>{{i18n "upload_selector.uploading"}} {{uploadProgress}}%</span>
+                  {{loading-spinner size="small"}}<span>{{i18n "upload_selector.uploading"}} {{this.uploadProgress}}%</span>
                 {{/if}}
 
-                {{#if isCancellable}}
+                {{#if this.isCancellable}}
                   <a href id="cancel-file-upload" {{action "cancelUpload"}}>{{d-icon "times"}}</a>
                 {{/if}}
               </div>
             {{/if}}
 
-            <div class={{if isUploading "hidden"}} id="draft-status">
-              {{#if model.draftStatus}}
-                <span class="draft-error" title={{model.draftStatus}}>
-                  {{#if model.draftConflictUser}}
-                    {{avatar model.draftConflictUser imageSize="small"}} {{d-icon "user-edit"}}
+            <div class={{if this.isUploading "hidden"}} id="draft-status">
+              {{#if this.model.draftStatus}}
+                <span class="draft-error" title={{this.model.draftStatus}}>
+                  {{#if this.model.draftConflictUser}}
+                    {{avatar this.model.draftConflictUser imageSize="small"}} {{d-icon "user-edit"}}
                   {{else}}
                     {{d-icon "exclamation-triangle"}}
                   {{/if}}
-                  {{#unless site.mobileView}}
-                    {{model.draftStatus}}
+                  {{#unless this.site.mobileView}}
+                    {{this.model.draftStatus}}
                   {{/unless}}
                 </span>
               {{/if}}
             </div>
 
-            <PluginOutlet @name="composer-after-save-or-cancel" @tagName="span" @args={{hash model=model}} />
+            <PluginOutlet @name="composer-after-save-or-cancel" @tagName="span" @args={{hash model=this.model}} />
           </div>
 
-          {{#if site.mobileView}}
-            <PluginOutlet @name="composer-mobile-buttons-bottom" @tagName="span" @args={{hash model=model}} />
+          {{#if this.site.mobileView}}
+            <PluginOutlet @name="composer-mobile-buttons-bottom" @tagName="span" @args={{hash model=this.model}} />
 
-            {{#if allowUpload}}
-              <a id="mobile-file-upload" class="btn btn-default no-text mobile-file-upload {{if isUploading "hidden"}}"  aria-label={{i18n "composer.upload_title"}}>
-                {{d-icon uploadIcon}}
+            {{#if this.allowUpload}}
+              <a id="mobile-file-upload" class="btn btn-default no-text mobile-file-upload {{if this.isUploading "hidden"}}" aria-label={{i18n "composer.upload_title"}}>
+                {{d-icon this.uploadIcon}}
               </a>
             {{/if}}
 
@@ -164,32 +164,32 @@
               {{d-icon "desktop"}}
             </a>
 
-            {{#if showPreview}}
+            {{#if this.showPreview}}
               <DButton @action={{action "togglePreview"}} @class="hide-preview" @ariaLabel="composer.hide_preview" @icon="pencil-alt" />
             {{/if}}
           {{else}}
-            <DButton @action={{action "togglePreview"}} @translatedTitle={{toggleText}} @icon="angle-double-left" @class={{concat "btn-flat btn-mini-toggle toggle-preview " (unless showPreview "active")}} />
+            <DButton @action={{action "togglePreview"}} @translatedTitle={{this.toggleText}} @icon="angle-double-left" @class={{concat "btn-flat btn-mini-toggle toggle-preview " (unless this.showPreview "active")}} />
           {{/if}}
         </div>
       </div>
     {{else}}
       <div class="saving-text">
-        {{#if model.createdPost}}
-          {{i18n "composer.saved"}} <a href={{createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
+        {{#if this.model.createdPost}}
+          {{i18n "composer.saved"}} <a href={{this.createdPost.url}} {{action "viewNewReply"}} class="permalink">{{i18n "composer.view_new_post"}}</a>
         {{else}}
           {{i18n "composer.saving"}} {{loading-spinner size="small"}}
         {{/if}}
       </div>
 
       <div class="draft-text">
-        {{#if model.topic}}
-          {{d-icon "share"}} {{html-safe draftTitle}}
+        {{#if this.model.topic}}
+          {{d-icon "share"}} {{html-safe this.draftTitle}}
         {{else}}
           {{i18n "composer.saved_draft"}}
         {{/if}}
       </div>
 
-      <ComposerToggles @composeState={{model.composeState}} @toggleFullscreen={{action "openIfDraft"}} @toggleComposer={{action "toggle"}} @toggleToolbar={{action "toggleToolbar"}} />
+      <ComposerToggles @composeState={{this.model.composeState}} @toggleFullscreen={{action "openIfDraft"}} @toggleComposer={{action "toggle"}} @toggleToolbar={{action "toggleToolbar"}} />
     {{/if}}
   {{/if}}
 </ComposerBody>
diff --git a/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
index 29edcc80801..1a7d7647a0a 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/custom-body.hbs
@@ -1,3 +1,3 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
-{{#if message.title}}<h3>{{message.title}}</h3>{{/if}}
-<p>{{html-safe message.body}}</p>
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
+{{#if this.message.title}}<h3>{{this.message.title}}</h3>{{/if}}
+<p>{{html-safe this.message.body}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
index bd9be1b1f9e..c76aba17c8d 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/dominating-topic.hbs
@@ -1,7 +1,7 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
 
-{{html-safe message.body}}
+{{html-safe this.message.body}}
 
-{{#if currentUser.can_invite_to_forum}}
-  <DButton @class="btn-primary" @label="footer_nav.share" @icon="link" @action={{action shareModal}} />
+{{#if this.currentUser.can_invite_to_forum}}
+  <DButton @class="btn-primary" @label="footer_nav.share" @icon="link" @action={{action this.shareModal}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/education.hbs b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
index c3a23009b37..b717e32d922 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/education.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/education.hbs
@@ -1,2 +1,2 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
-{{html-safe message.body}}
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
+{{html-safe this.message.body}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
index 5ce1030afb6..f3e0a5a4a3b 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/get-a-room.hbs
@@ -1,5 +1,5 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
 
-{{html-safe message.body}}
+{{html-safe this.message.body}}
 
-<DButton @class="btn-primary" @label="user.private_message" @icon="envelope" @action={{action switchPM message}} />
+<DButton @class="btn-primary" @label="user.private_message" @icon="envelope" @action={{action this.switchPM this.message}} />
diff --git a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
index c3a23009b37..b717e32d922 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/group-mentioned.hbs
@@ -1,2 +1,2 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
-{{html-safe message.body}}
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
+{{html-safe this.message.body}}
diff --git a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
index 98a0dfd388b..775b160e6bc 100644
--- a/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/composer/similar-topics.hbs
@@ -1,6 +1,6 @@
-<a href {{action closeMessage message}} class="close">{{d-icon "times"}}</a>
+<a href {{action this.closeMessage this.message}} class="close">{{d-icon "times"}}</a>
 <h3>{{i18n "composer.similar_topics"}}</h3>
 
 <ul class="topics">
-  <MountWidget @widget="search-result-topic" @args={{hash results=message.similarTopics}} />
+  <MountWidget @widget="search-result-topic" @args={{hash results=this.message.similarTopics}} />
 </ul>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery.hbs b/app/assets/javascripts/discourse/app/templates/discovery.hbs
index 1ce665e6084..bcc1ce644ef 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery.hbs
@@ -1,7 +1,7 @@
 <div class="container">
-  <DiscourseBanner @user={{currentUser}} @banner={{site.banner}} />
-  {{#unless viewingCategoriesList}}
-    <CategoryReadOnlyBanner @category={{category}} @readOnly={{navigationCategory.cannotCreateTopicOnCategory}} />
+  <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
+  {{#unless this.viewingCategoriesList}}
+    <CategoryReadOnlyBanner @category={{this.category}} @readOnly={{this.navigationCategory.cannotCreateTopicOnCategory}} />
   {{/unless}}
 </div>
 
@@ -14,16 +14,16 @@
   </div>
 </div>
 
-<ConditionalLoadingSpinner @condition={{loading}} />
+<ConditionalLoadingSpinner @condition={{this.loading}} />
 
 <PluginOutlet @name="discovery-above" @tagName="span" @connectorTagName="div" />
 
-<div class="container list-container {{if loading "hidden"}}">
+<div class="container list-container {{if this.loading "hidden"}}">
   <div class="row">
     <div class="full-width">
       <div id="header-list-area">
         {{outlet "header-list-container"}}
-        <PluginOutlet @name="header-list-container-bottom" @args={{hash category=category}} />
+        <PluginOutlet @name="header-list-container-bottom" @args={{hash category=this.category}} />
       </div>
     </div>
   </div>
@@ -31,7 +31,7 @@
     <div class="full-width">
       <PluginOutlet @name="before-list-area" />
       <div id="list-area">
-        <PluginOutlet @name="discovery-list-container-top" @tagName="" @connectorTagName="span" @args={{hash category=category listLoading=loading}} />
+        <PluginOutlet @name="discovery-list-container-top" @tagName="" @connectorTagName="span" @args={{hash category=this.category listLoading=this.loading}} />
         {{outlet "list-container"}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
index 6fe7c64c541..7f131c225c0 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/categories.hbs
@@ -1,17 +1,17 @@
-<PluginOutlet @name="above-discovery-categories" @connectorTagName="div" @args={{hash categories=model.categories categoryPageStyle=categoryPageStyle topics=model.topics}} />
+<PluginOutlet @name="above-discovery-categories" @connectorTagName="div" @args={{hash categories=this.model.categories categoryPageStyle=this.categoryPageStyle topics=this.model.topics}} />
 
 <DiscoveryCategories @refresh={{action "refresh"}}>
-  {{#if topicTrackingState.hasIncoming}}
-    <div class="show-more {{if hasTopics "has-topics"}}">
+  {{#if this.topicTrackingState.hasIncoming}}
+    <div class="show-more {{if this.hasTopics "has-topics"}}">
       <div role="button" class="alert alert-info clickable" {{action "showInserted"}}>
-        <CountI18n @key="topic_count_" @suffix={{topicTrackingState.filter}} @count={{topicTrackingState.incomingCount}} />
+        <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </div>
     </div>
   {{/if}}
 
-  {{component categoryPageStyle
-              categories=model.categories
-              topics=model.topics}}
+  {{component this.categoryPageStyle
+              categories=this.model.categories
+              topics=this.model.topics}}
 </DiscoveryCategories>
 
-<PluginOutlet @name="below-discovery-categories" @connectorTagName="div" @args={{hash categories=model.categories categoryPageStyle=categoryPageStyle topics=model.topics}} />
+<PluginOutlet @name="below-discovery-categories" @connectorTagName="div" @args={{hash categories=this.model.categories categoryPageStyle=this.categoryPageStyle topics=this.model.topics}} />
diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
index 259594a8186..8e6196607ef 100644
--- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
@@ -1,49 +1,49 @@
-{{#if redirectedReason}}
-  <div class="alert alert-info">{{redirectedReason}}</div>
+{{#if this.redirectedReason}}
+  <div class="alert alert-info">{{this.redirectedReason}}</div>
 {{/if}}
 
-<TopicDismissButtons @position="top" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+<TopicDismissButtons @position="top" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-{{#if model.sharedDrafts}}
-  <TopicList @class="shared-drafts" @listTitle="shared_drafts.title" @top={{top}} @hideCategory="true" @category={{category}} @topics={{model.sharedDrafts}} @discoveryList={{true}} />
+{{#if this.model.sharedDrafts}}
+  <TopicList @class="shared-drafts" @listTitle="shared_drafts.title" @top={{this.top}} @hideCategory="true" @category={{this.category}} @topics={{this.model.sharedDrafts}} @discoveryList={{true}} />
 {{/if}}
 
-<DiscoveryTopicsList @model={{model}} @refresh={{action "refresh"}} @loadingComplete={{action "loadingComplete"}} @incomingCount={{topicTrackingState.incomingCount}} @autoAddTopicsToBulkSelect={{autoAddTopicsToBulkSelect}} @bulkSelectEnabled={{bulkSelectEnabled}} @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}} as |discoveryTopicList|>
-  {{#if top}}
+<DiscoveryTopicsList @model={{this.model}} @refresh={{action "refresh"}} @loadingComplete={{action "loadingComplete"}} @incomingCount={{this.topicTrackingState.incomingCount}} @autoAddTopicsToBulkSelect={{this.autoAddTopicsToBulkSelect}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}} as |discoveryTopicList|>
+  {{#if this.top}}
     <div class="top-lists">
-      <PeriodChooser @period={{period}} @action={{action "changePeriod"}} @fullDay={{false}} />
+      <PeriodChooser @period={{this.period}} @action={{action "changePeriod"}} @fullDay={{false}} />
     </div>
   {{else}}
-    {{#if topicTrackingState.hasIncoming}}
-      <div class="show-more {{if hasTopics "has-topics"}}">
+    {{#if this.topicTrackingState.hasIncoming}}
+      <div class="show-more {{if this.hasTopics "has-topics"}}">
         <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
-          <CountI18n @key="topic_count_" @suffix={{topicTrackingState.filter}} @count={{topicTrackingState.incomingCount}} />
+          <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
         </a>
       </div>
     {{/if}}
   {{/if}}
-  <PluginOutlet @name="before-topic-list" @tagName="span" @connectorTagName="div" @args={{hash category=category}} />
+  <PluginOutlet @name="before-topic-list" @tagName="span" @connectorTagName="div" @args={{hash category=this.category}} />
 
-  {{#if hasTopics}}
-    <TopicList @highlightLastVisited={{true}} @top={{top}} @showTopicPostBadges={{showTopicPostBadges}} @showPosters={{true}} @canBulkSelect={{canBulkSelect}} @changeSort={{route-action "changeSort"}} @toggleBulkSelect={{action "toggleBulkSelect"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} @hideCategory={{model.hideCategory}} @order={{order}} @ascending={{ascending}} @bulkSelectEnabled={{bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @selected={{selected}} @expandGloballyPinned={{expandGloballyPinned}} @expandAllPinned={{expandAllPinned}} @category={{category}} @topics={{model.topics}} @discoveryList={{true}} @scrollOnLoad={{true}} @onScroll={{discoveryTopicList.saveScrollPosition}} @focusLastVisitedTopic={{true}} />
+  {{#if this.hasTopics}}
+    <TopicList @highlightLastVisited={{true}} @top={{this.top}} @showTopicPostBadges={{this.showTopicPostBadges}} @showPosters={{true}} @canBulkSelect={{this.canBulkSelect}} @changeSort={{route-action "changeSort"}} @toggleBulkSelect={{action "toggleBulkSelect"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} @hideCategory={{this.model.hideCategory}} @order={{this.order}} @ascending={{this.ascending}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @selected={{this.selected}} @expandGloballyPinned={{this.expandGloballyPinned}} @expandAllPinned={{this.expandAllPinned}} @category={{this.category}} @topics={{this.model.topics}} @discoveryList={{true}} @scrollOnLoad={{true}} @onScroll={{discoveryTopicList.saveScrollPosition}} @focusLastVisitedTopic={{true}} />
   {{/if}}
 
-  <PluginOutlet @name="after-topic-list" @tagName="span" @connectorTagName="div" @args={{hash category=category}} />
+  <PluginOutlet @name="after-topic-list" @tagName="span" @connectorTagName="div" @args={{hash category=this.category}} />
 </DiscoveryTopicsList>
 
 <footer class="topic-list-bottom">
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
-  {{#if allLoaded}}
-    <TopicDismissButtons @position="bottom" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
+  {{#if this.allLoaded}}
+    <TopicDismissButtons @position="bottom" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-    <FooterMessage @education={{footerEducation}} @message={{footerMessage}}>
-      {{#if latest}}
-        {{#if canCreateTopicOnCategory}}
+    <FooterMessage @education={{this.footerEducation}} @message={{this.footerMessage}}>
+      {{#if this.latest}}
+        {{#if this.canCreateTopicOnCategory}}
           <DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" />
         {{/if}}
-      {{else if top}}
+      {{else if this.top}}
         <LinkTo @route="discovery.categories">{{i18n "topic.browse_all_categories"}}</LinkTo>, <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{i18n "or"}} {{i18n "filters.top.other_periods"}}
-        <TopPeriodButtons @period={{period}} @action={{action "changePeriod"}} />
+        <TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} />
       {{else}}
         <LinkTo @route="discovery.categories"> {{i18n "topic.browse_all_categories"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
index f9fa38b6853..c20a1084ef3 100644
--- a/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/edit-category-tabs.hbs
@@ -1,13 +1,13 @@
-<div class="edit-category {{if expandedMenu "expanded-menu"}}">
+<div class="edit-category {{if this.expandedMenu "expanded-menu"}}">
   <div class="edit-category-title-bar">
     <div class="edit-category-title">
-      <h2>{{title}}</h2>
-      {{#if model.id}}
-        <BreadCrumbs @categories={{site.categoriesList}} @category={{model}} @noSubcategories={{model.noSubcategories}} @editingCategory={{true}} @editingCategoryTab={{selectedTab}} />
+      <h2>{{this.title}}</h2>
+      {{#if this.model.id}}
+        <BreadCrumbs @categories={{this.site.categoriesList}} @category={{this.model}} @noSubcategories={{this.model.noSubcategories}} @editingCategory={{true}} @editingCategoryTab={{this.selectedTab}} />
       {{/if}}
     </div>
-    {{#unless mobileView}}
-      {{#if model.id}}
+    {{#unless this.mobileView}}
+      {{#if this.model.id}}
         <DButton @class="category-back" @action={{action "goBack"}} @label="category.back" @icon="caret-left" />
       {{/if}}
     {{/unless}}
@@ -15,39 +15,39 @@
 
   <div class="edit-category-nav">
     <ul class="nav nav-stacked">
-      <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="general" />
-      <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="security" />
-      <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="settings" />
-      <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="images" />
-      <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="topic-template" />
-      {{#if siteSettings.tagging_enabled}}
-        <EditCategoryTab @panels={{panels}} @selectedTab={{selectedTab}} @params={{parentParams}} @tab="tags" />
+      <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="general" />
+      <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="security" />
+      <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="settings" />
+      <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="images" />
+      <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="topic-template" />
+      {{#if this.siteSettings.tagging_enabled}}
+        <EditCategoryTab @panels={{this.panels}} @selectedTab={{this.selectedTab}} @params={{this.parentParams}} @tab="tags" />
       {{/if}}
     </ul>
   </div>
 
   <div class="edit-category-content">
-    <h3>{{selectedTabTitle}}</h3>
+    <h3>{{this.selectedTabTitle}}</h3>
 
-    {{#each panels as |tab|}}
-      {{component tab selectedTab=selectedTab category=model registerValidator=(action "registerValidator")}}
+    {{#each this.panels as |tab|}}
+      {{component tab selectedTab=this.selectedTab category=this.model registerValidator=(action "registerValidator")}}
     {{/each}}
   </div>
 
-  {{#if showDeleteReason}}
+  {{#if this.showDeleteReason}}
     <div class="edit-category-delete-warning">
-      <p class="warning">{{html-safe model.cannot_delete_reason}}</p>
+      <p class="warning">{{html-safe this.model.cannot_delete_reason}}</p>
     </div>
   {{/if}}
 
   <div class="edit-category-footer">
-    <DButton @id="save-category" @class="btn-primary" @disabled={{disabled}} @action={{action "saveCategory"}} @label={{saveLabel}} />
+    <DButton @id="save-category" @class="btn-primary" @disabled={{this.disabled}} @action={{action "saveCategory"}} @label={{this.saveLabel}} />
 
-    {{#if model.can_delete}}
-      <DButton @class="btn-danger" @disabled={{deleteDisabled}} @action={{action "deleteCategory"}} @icon="far-trash-alt" @label="category.delete" />
-    {{else if model.id}}
+    {{#if this.model.can_delete}}
+      <DButton @class="btn-danger" @disabled={{this.deleteDisabled}} @action={{action "deleteCategory"}} @icon="far-trash-alt" @label="category.delete" />
+    {{else if this.model.id}}
       <div class="disable-info">
-        <DButton @disabled={{deleteDisabled}} @class="btn-default" @action={{action "toggleDeleteTooltip"}} @icon="question-circle" @label="category.delete" />
+        <DButton @disabled={{this.deleteDisabled}} @class="btn-default" @action={{action "toggleDeleteTooltip"}} @icon="question-circle" @label="category.delete" />
       </div>
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/email-login.hbs b/app/assets/javascripts/discourse/app/templates/email-login.hbs
index 772d627a377..e642b5be994 100644
--- a/app/assets/javascripts/discourse/app/templates/email-login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/email-login.hbs
@@ -1,32 +1,32 @@
 <div class="container email-login clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "email_login.emoji"}}>
+    <img src={{this.lockImageUrl}} class="password-reset-img" alt={{i18n "email_login.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
     <form>
-      {{#if model.error}}
+      {{#if this.model.error}}
         <div class="alert alert-error">
-          {{model.error}}
+          {{this.model.error}}
         </div>
       {{/if}}
 
-      {{#if model.can_login}}
-        {{#if secondFactorRequired }}
-          {{#if model.security_key_required }}
-            <SecurityKeyForm @allowedCredentialIds={{model.allowed_credential_ids}} @challenge={{model.security_key_challenge}} @showSecurityKey={{model.security_key_required}} @showSecondFactor={{false}} @secondFactorMethod={{secondFactorMethod}} @otherMethodAllowed={{secondFactorRequired}} @action={{action "authenticateSecurityKey"}}>
+      {{#if this.model.can_login}}
+        {{#if this.secondFactorRequired }}
+          {{#if this.model.security_key_required }}
+            <SecurityKeyForm @allowedCredentialIds={{this.model.allowed_credential_ids}} @challenge={{this.model.security_key_challenge}} @showSecurityKey={{this.model.security_key_required}} @showSecondFactor={{false}} @secondFactorMethod={{this.secondFactorMethod}} @otherMethodAllowed={{this.secondFactorRequired}} @action={{action "authenticateSecurityKey"}}>
             </SecurityKeyForm>
           {{else}}
-            <SecondFactorForm @secondFactorMethod={{secondFactorMethod}} @secondFactorToken={{secondFactorToken}} @backupEnabled={{model.backup_codes_enabled}} @isLogin={{true}}>
-              <SecondFactorInput @value={{secondFactorToken}} @secondFactorMethod={{secondFactorMethod}} @backupEnabled={{backupEnabled}} />
+            <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @backupEnabled={{this.model.backup_codes_enabled}} @isLogin={{true}}>
+              <SecondFactorInput @value={{this.secondFactorToken}} @secondFactorMethod={{this.secondFactorMethod}} @backupEnabled={{this.backupEnabled}} />
             </SecondFactorForm>
           {{/if}}
         {{else}}
-          <h2>{{i18n "email_login.confirm_title" site_name=siteSettings.title}}</h2>
-          <p>{{i18n "email_login.logging_in_as" email=model.token_email}}</p>
+          <h2>{{i18n "email_login.confirm_title" site_name=this.siteSettings.title}}</h2>
+          <p>{{i18n "email_login.logging_in_as" email=this.model.token_email}}</p>
         {{/if}}
 
-        {{#unless model.security_key_required }}
+        {{#unless this.model.security_key_required }}
           <DButton @label="email_login.confirm_button" @action={{action "finishLogin"}} @type="submit" @class="btn-primary" />
         {{/unless}}
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/exception.hbs b/app/assets/javascripts/discourse/app/templates/exception.hbs
index 0b658f238c9..3633687beab 100644
--- a/app/assets/javascripts/discourse/app/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/app/templates/exception.hbs
@@ -4,24 +4,24 @@
   {{else}}
     <div class="error-page">
       <div class="face">:(</div>
-      <div class="reason">{{reason}}</div>
-      {{#if requestUrl}}
+      <div class="reason">{{this.reason}}</div>
+      {{#if this.requestUrl}}
         <div class="url">
-          {{i18n "errors.prev_page"}} <a href={{requestUrl}} data-auto-route="true">{{requestUrl}}</a>
+          {{i18n "errors.prev_page"}} <a href={{this.requestUrl}} data-auto-route="true">{{this.requestUrl}}</a>
         </div>
       {{/if}}
       <div class="desc">
-        {{#if networkFixed}}
+        {{#if this.networkFixed}}
           {{d-icon "check-circle"}}
         {{/if}}
 
-        {{desc}}
+        {{this.desc}}
       </div>
       <div class="buttons">
-        {{#each enabledButtons as |buttonData|}}
+        {{#each this.enabledButtons as |buttonData|}}
           <DButton @icon={{buttonData.icon}} @action={{buttonData.action}} @label={{buttonData.key}} @class={{buttonData.classes}} />
         {{/each}}
-        <ConditionalLoadingSpinner @condition={{loading}} />
+        <ConditionalLoadingSpinner @condition={{this.loading}} />
       </div>
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
index 8256a2a2749..df179ce1538 100644
--- a/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/app/templates/full-page-search.hbs
@@ -1,40 +1,40 @@
 <DSection @pageClass="search" @class="search-container">
-  <ScrollTracker @name="full-page-search" @tag={{searchTerm}} @class="hidden" />
+  <ScrollTracker @name="full-page-search" @tag={{this.searchTerm}} @class="hidden" />
 
   <div class="search-header" role="search">
     <h1 class="search-page-heading">
-      {{#if hasResults}}
+      {{#if this.hasResults}}
         <div class="result-count" id="search-result-count" aria-live="polite">
-          {{html-safe resultCountLabel}}
+          {{html-safe this.resultCountLabel}}
         </div>
       {{else}}
         {{i18n "search.full_page_title"}}
       {{/if}}
     </h1>
     <div class="search-bar">
-      <SearchTextField @value={{searchTerm}} @class="full-page-search search no-blur search-query" @aria-label={{i18n "search.search_term_label"}} @enter={{action "search" (hash collapseFilters=true)}} @hasAutofocus={{hasAutofocus}} @aria-controls="search-result-count" />
-      <ComboBox @id="search-type" @value={{search_type}} @content={{searchTypes}} @onChange={{action (mut search_type)}} @options={{hash
+      <SearchTextField @value={{this.searchTerm}} @class="full-page-search search no-blur search-query" @aria-label={{i18n "search.search_term_label"}} @enter={{action "search" (hash collapseFilters=true)}} @hasAutofocus={{this.hasAutofocus}} @aria-controls="search-result-count" />
+      <ComboBox @id="search-type" @value={{this.search_type}} @content={{this.searchTypes}} @onChange={{action (mut this.search_type)}} @options={{hash
           castInteger=true
         }} />
-      <DButton @action={{action "search" (hash collapseFilters=true)}} @icon="search" @label="search.search_button" @class="btn-primary search-cta" @ariaLabel="search.search_button" @disabled={{searchButtonDisabled}} />
+      <DButton @action={{action "search" (hash collapseFilters=true)}} @icon="search" @label="search.search_button" @class="btn-primary search-cta" @ariaLabel="search.search_button" @disabled={{this.searchButtonDisabled}} />
     </div>
-    {{#if usingDefaultSearchType}}
+    {{#if this.usingDefaultSearchType}}
       {{!-- context is only provided when searching from mobile view --}}
-      {{#if context}}
+      {{#if this.context}}
         <div class="search-context">
           <label>
-            <Input @type="checkbox" @name="searchContext" @checked={{searchContextEnabled}} /> {{searchContextDescription}}
+            <Input @type="checkbox" @name="searchContext" @checked={{this.searchContextEnabled}} /> {{this.searchContextDescription}}
           </label>
         </div>
       {{/if}}
 
       <div class="search-filters">
-        <SearchAdvancedOptions @searchTerm={{readonly searchTerm}} @onChangeSearchTerm={{action (mut searchTerm)}} @search={{action "search" (hash collapseFilters=true)}} @searchButtonDisabled={{searchButtonDisabled}} @expandFilters={{expandFilters}} />
+        <SearchAdvancedOptions @searchTerm={{readonly this.searchTerm}} @onChangeSearchTerm={{action (mut this.searchTerm)}} @search={{action "search" (hash collapseFilters=true)}} @searchButtonDisabled={{this.searchButtonDisabled}} @expandFilters={{this.expandFilters}} />
       </div>
     {{/if}}
 
     <div class="search-notice">
-      {{#if invalidSearch}}
+      {{#if this.invalidSearch}}
         <div class="fps-invalid">
           {{i18n "search.too_short"}}
         </div>
@@ -44,22 +44,22 @@
   </div>
 
   <div class="search-advanced">
-    {{#if hasResults}}
-      {{#if usingDefaultSearchType}}
-        <div class={{searchInfoClassNames}} role="region" ariaLabel={{i18n "search.sort_or_bulk_actions"}}>
-          {{#if canBulkSelect}}
+    {{#if this.hasResults}}
+      {{#if this.usingDefaultSearchType}}
+        <div class={{this.searchInfoClassNames}} role="region" ariaLabel={{i18n "search.sort_or_bulk_actions"}}>
+          {{#if this.canBulkSelect}}
             <DButton @icon="list" @class="btn-default bulk-select" @title="topics.bulk.toggle" @action={{action "toggleBulkSelect"}} />
-            {{#if selected}}
-              <DButton @class="btn-default bulk-select-btn" @selected={{selected}} @action={{action "showBulkActions"}} @icon="wrench" />
+            {{#if this.selected}}
+              <DButton @class="btn-default bulk-select-btn" @selected={{this.selected}} @action={{action "showBulkActions"}} @icon="wrench" />
             {{/if}}
           {{/if}}
 
-          {{#if bulkSelectEnabled}}
-            {{#if hasUnselectedResults}}
+          {{#if this.bulkSelectEnabled}}
+            {{#if this.hasUnselectedResults}}
               <DButton @icon="check-square" @class="btn-default" @action={{action "selectAll"}} @label="search.select_all" />
             {{/if}}
 
-            {{#if hasSelection}}
+            {{#if this.hasSelection}}
               <DButton @icon="far-square" @class="btn-default" @action={{action "clearAll"}} @label="search.clear_all" />
             {{/if}}
           {{/if}}
@@ -68,7 +68,7 @@
             <label>
               {{i18n "search.sort_by"}}
             </label>
-            <ComboBox @value={{sortOrder}} @content={{sortOrders}} @onChange={{action (mut sortOrder)}} @id="search-sort-by" @options={{hash
+            <ComboBox @value={{this.sortOrder}} @content={{this.sortOrders}} @onChange={{action (mut this.sortOrder)}} @id="search-sort-by" @options={{hash
                 castInteger=true
               }} />
           </div>
@@ -76,33 +76,33 @@
       {{/if}}
     {{/if}}
 
-    <PluginOutlet @name="full-page-search-below-search-info" @tagName="span" @connectorTagName="div" @args={{hash search=searchTerm}} />
+    <PluginOutlet @name="full-page-search-below-search-info" @tagName="span" @connectorTagName="div" @args={{hash search=this.searchTerm}} />
 
-    {{#if searching}}
+    {{#if this.searching}}
       {{loading-spinner size="medium"}}
     {{else}}
       <div class="search-results" role="region">
         <LoadMore @selector=".fps-result" @action={{action "loadMore"}}>
-          {{#if usingDefaultSearchType}}
-            <SearchResultEntries @posts={{model.posts}} @bulkSelectEnabled={{bulkSelectEnabled}} @selected={{selected}} @highlightQuery={{highlightQuery}} @searchLogId={{model.grouped_search_result.search_log_id}} />
+          {{#if this.usingDefaultSearchType}}
+            <SearchResultEntries @posts={{this.model.posts}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @selected={{this.selected}} @highlightQuery={{this.highlightQuery}} @searchLogId={{this.model.grouped_search_result.search_log_id}} />
 
-            <ConditionalLoadingSpinner @condition={{loading}}>
-              {{#unless hasResults}}
-                {{#if searchActive}}
+            <ConditionalLoadingSpinner @condition={{this.loading}}>
+              {{#unless this.hasResults}}
+                {{#if this.searchActive}}
                   <h3>{{i18n "search.no_results"}}</h3>
 
-                  {{#if model.grouped_search_result.error}}
+                  {{#if this.model.grouped_search_result.error}}
                     <div class="warning">
-                      {{model.grouped_search_result.error}}
+                      {{this.model.grouped_search_result.error}}
                     </div>
                   {{/if}}
 
-                  {{#if showSuggestion}}
+                  {{#if this.showSuggestion}}
                     <div class="no-results-suggestion">
                       {{i18n "search.cant_find"}}
-                      {{#if canCreateTopic}}
-                        <a href {{action "createTopic" searchTerm}}>{{i18n "search.start_new_topic"}}</a>
-                        {{#unless siteSettings.login_required}}
+                      {{#if this.canCreateTopic}}
+                        <a href {{action "createTopic" this.searchTerm}}>{{i18n "search.start_new_topic"}}</a>
+                        {{#unless this.siteSettings.login_required}}
                           {{i18n "search.or_search_google"}}
                         {{/unless}}
                       {{else}}
@@ -110,15 +110,15 @@
                       {{/if}}
                     </div>
 
-                    <GoogleSearch @searchTerm={{searchTerm}} />
+                    <GoogleSearch @searchTerm={{this.searchTerm}} />
                   {{/if}}
                 {{/if}}
               {{/unless}}
 
-              {{#if hasResults}}
+              {{#if this.hasResults}}
                 <h3 class="search-footer">
-                  {{#if model.grouped_search_result.more_full_page_results}}
-                    {{#if isLastPage}}
+                  {{#if this.model.grouped_search_result.more_full_page_results}}
+                    {{#if this.isLastPage}}
                       {{i18n "search.more_results"}}
                     {{/if}}
                   {{else}}
@@ -128,26 +128,26 @@
               {{/if}}
             </ConditionalLoadingSpinner>
           {{else}}
-            <ConditionalLoadingSpinner @condition={{loading}}>
-              {{#if hasResults}}
-                {{#if model.categories.length}}
+            <ConditionalLoadingSpinner @condition={{this.loading}}>
+              {{#if this.hasResults}}
+                {{#if this.model.categories.length}}
                   <h4 class="category-heading">
                     {{i18n "search.categories"}}
                   </h4>
                   <div class="category-items">
-                    {{#each model.categories as |category|}}
+                    {{#each this.model.categories as |category|}}
                       {{category-link category extraClasses="fps-category-item"}}
                     {{/each}}
                   </div>
                 {{/if}}
 
-                {{#if model.tags.length}}
+                {{#if this.model.tags.length}}
                   <h4 class="tag-heading">
                     {{i18n "search.tags"}}
                   </h4>
 
                   <div class="tag-items">
-                    {{#each model.tags as |tag|}}
+                    {{#each this.model.tags as |tag|}}
                       <div class="fps-tag-item">
                         <a href={{tag.url}}>
                           {{tag.id}}
@@ -157,9 +157,9 @@
                   </div>
                 {{/if}}
 
-                {{#if model.users}}
+                {{#if this.model.users}}
                   <div class="user-items">
-                    {{#each model.users as |user|}}
+                    {{#each this.model.users as |user|}}
                       <UserLink @user={{user}} @class="fps-user-item">
                         {{avatar user imageSize="large"}}
 
@@ -179,7 +179,7 @@
                   </div>
                 {{/if}}
               {{else}}
-                {{#if searchActive}}
+                {{#if this.searchActive}}
                   <h3>{{i18n "search.no_results"}}</h3>
                 {{/if}}
               {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
index 47f023d7a19..3955707e019 100644
--- a/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-activity-posts.hbs
@@ -1,10 +1,10 @@
 <LoadMore @selector=".user-stream-item" @action={{action "loadMore"}}>
   <div class="user-stream">
-    {{#each model as |post|}}
+    {{#each this.model as |post|}}
       <GroupPost @post={{post}} />
     {{else}}
-      <div>{{i18n emptyText}}</div>
+      <div>{{i18n this.emptyText}}</div>
     {{/each}}
   </div>
-  <ConditionalLoadingSpinner @condition={{loading}} />
+  <ConditionalLoadingSpinner @condition={{this.loading}} />
 </LoadMore>
diff --git a/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs b/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs
index 882a7d18334..a1be655a55d 100644
--- a/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-activity-topics.hbs
@@ -1,4 +1,4 @@
 <LoadMore @class="paginated-topics-list" @selector=".paginated-topics-list .topic-list tr" @action={{action "loadMore"}}>
-  <BasicTopicList @topicList={{model}} @showPosters={{true}} />
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+  <BasicTopicList @topicList={{this.model}} @showPosters={{true}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
 </LoadMore>
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index a90c72e7511..b253a659b15 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -1,61 +1,61 @@
 <section class="user-content">
   <div class="group-members-actions">
-    {{#if model.can_see_members}}
-      <TextField @value={{filterInput}} @placeholderKey={{filterPlaceholder}} @autocomplete="off" @class="group-username-filter no-blur" />
+    {{#if this.model.can_see_members}}
+      <TextField @value={{this.filterInput}} @placeholderKey={{this.filterPlaceholder}} @autocomplete="off" @class="group-username-filter no-blur" />
     {{/if}}
 
-    {{#if canManageGroup}}
+    {{#if this.canManageGroup}}
       <div class="group-members-manage">
         <DButton @icon="plus" @action={{route-action "showAddMembersModal"}} @label="groups.manage.add_members" @class="btn-default group-members-add" />
 
-        {{#if currentUser.can_invite_to_forum}}
+        {{#if this.currentUser.can_invite_to_forum}}
           <DButton @icon="plus" @action={{route-action "showInviteModal"}} @label="groups.manage.invite_members" @class="btn-default group-members-add" />
         {{/if}}
       </div>
     {{/if}}
   </div>
 
-  {{#if hasMembers}}
+  {{#if this.hasMembers}}
     <LoadMore @selector=".group-members tr" @action={{action "loadMore"}}>
-      <table class={{if isBulk "group-members sticky-header" "group-members"}}>
+      <table class={{if this.isBulk "group-members sticky-header" "group-members"}}>
         <thead>
           <tr>
             <th class="bulk-select">
-              {{#if canManageGroup}}
+              {{#if this.canManageGroup}}
                 <FlatButton @class="bulk-select" @icon="list" @action={{action "toggleBulkSelect"}} @title="topics.bulk.toggle" />
               {{/if}}
             </th>
-            {{#if isBulk}}
+            {{#if this.isBulk}}
               <th class="bulk-select-buttons">
                 <span class="bulk-select-buttons-wrap">
-                  {{#if bulkSelection}}
-                    <GroupMemberDropdown @bulkSelection={{bulkSelection}} @canAdminGroup={{model.can_admin_group}} @onChange={{action "actOnSelection" bulkSelection}} />
+                  {{#if this.bulkSelection}}
+                    <GroupMemberDropdown @bulkSelection={{this.bulkSelection}} @canAdminGroup={{this.model.can_admin_group}} @onChange={{action "actOnSelection" this.bulkSelection}} />
                   {{/if}}
                   <DButton @action={{action "bulkSelectAll"}} @label="topics.bulk.select_all" />
                   <DButton @action={{action "bulkClearAll"}} @label="topics.bulk.clear_all" />
                 </span>
               </th>
             {{/if}}
-            <TableHeaderToggle @order={{order}} @asc={{asc}} @field="username_lower" @labelKey="username" @class="username" @automatic={{true}} />
+            <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="username_lower" @labelKey="username" @class="username" @automatic={{true}} />
             <th class="group-owner"></th>
-            <TableHeaderToggle @order={{order}} @asc={{asc}} @field="added_at" @labelKey="groups.member_added" @automatic={{true}} />
-            <TableHeaderToggle @order={{order}} @asc={{asc}} @field="last_posted_at" @labelKey="last_post" @automatic={{true}} />
-            <TableHeaderToggle @order={{order}} @asc={{asc}} @field="last_seen_at" @labelKey="last_seen" @automatic={{true}} />
+            <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="added_at" @labelKey="groups.member_added" @automatic={{true}} />
+            <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="last_posted_at" @labelKey="last_post" @automatic={{true}} />
+            <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="last_seen_at" @labelKey="last_seen" @automatic={{true}} />
             <th></th>
           </tr>
         </thead>
 
         <tbody>
-          {{#each model.members as |m|}}
+          {{#each this.model.members as |m|}}
             <tr>
-              {{#if isBulk}}
+              {{#if this.isBulk}}
                 <td class="bulk-select">
                   <Input @type="checkbox" class="bulk-select" @click={{action "selectMember" m}} />
                 </td>
               {{/if}}
 
               <td class="avatar" colspan="2">
-                <UserInfo @user={{m}} @skipName={{skipName}} />
+                <UserInfo @user={{m}} @skipName={{this.skipName}} />
               </td>
 
               <td class="group-owner">
@@ -77,8 +77,8 @@
               </td>
 
               <td>
-                {{#if canManageGroup}}
-                  <GroupMemberDropdown @member={{m}} @canAdminGroup={{model.can_admin_group}} @onChange={{action "actOnGroup" m}} />
+                {{#if this.canManageGroup}}
+                  <GroupMemberDropdown @member={{m}} @canAdminGroup={{this.model.can_admin_group}} @onChange={{action "actOnGroup" m}} />
                 {{/if}}
                 {{!-- group parameter is used by plugins --}}
               </td>
@@ -88,10 +88,10 @@
       </table>
     </LoadMore>
 
-    <ConditionalLoadingSpinner @condition={{loading}} />
+    <ConditionalLoadingSpinner @condition={{this.loading}} />
   {{else}}
     <br>
 
-    <div>{{i18n emptyMessageKey}}</div>
+    <div>{{i18n this.emptyMessageKey}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
index 709808f2d92..c6e229fabd2 100644
--- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs
@@ -1,25 +1,25 @@
 <section class="user-content">
 
   <div class="group-members-actions">
-    <TextField @value={{filterInput}} @placeholderKey={{filterPlaceholder}} @class="group-username-filter no-blur" />
+    <TextField @value={{this.filterInput}} @placeholderKey={{this.filterPlaceholder}} @class="group-username-filter no-blur" />
   </div>
 
-  {{#if hasRequesters}}
+  {{#if this.hasRequesters}}
     <LoadMore @selector=".group-members tr" @action={{action "loadMore"}}>
       <table class="group-members">
         <thead>
-          <TableHeaderToggle @order={{order}} @asc={{asc}} @field="username_lower" @labelKey="username" @automatic={{true}} />
-          <TableHeaderToggle @order={{order}} @asc={{asc}} @field="requested_at" @labelKey="groups.member_requested" @automatic={{true}} />
+          <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="username_lower" @labelKey="username" @automatic={{true}} />
+          <TableHeaderToggle @order={{this.order}} @asc={{this.asc}} @field="requested_at" @labelKey="groups.member_requested" @automatic={{true}} />
           <th>{{i18n "groups.requests.reason"}}</th>
           <th></th>
           <th></th>
         </thead>
 
         <tbody>
-          {{#each model.requesters as |m|}}
+          {{#each this.model.requesters as |m|}}
             <tr>
               <td class="avatar">
-                <UserInfo @user={{m}} @skipName={{skipName}} />
+                <UserInfo @user={{m}} @skipName={{this.skipName}} />
               </td>
               <td>
                 <span class="text">{{bound-date m.requested_at}}</span>
@@ -45,7 +45,7 @@
       </table>
     </LoadMore>
 
-    <ConditionalLoadingSpinner @condition={{loading}} />
+    <ConditionalLoadingSpinner @condition={{this.loading}} />
   {{else}}
     <div>{{i18n "groups.empty.requests"}}</div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/group.hbs b/app/assets/javascripts/discourse/app/templates/group.hbs
index 4fd57e67e37..3bd24df335a 100644
--- a/app/assets/javascripts/discourse/app/templates/group.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group.hbs
@@ -1,7 +1,7 @@
-<PluginOutlet @name="before-group-container" @tagName="span" @connectorTagName="div" @args={{hash group=model}} />
+<PluginOutlet @name="before-group-container" @tagName="span" @connectorTagName="div" @args={{hash group=this.model}} />
 
-<div class="container group group-{{model.name}}">
-  {{#if showTooltip}}
+<div class="container group group-{{this.model.name}}">
+  {{#if this.showTooltip}}
     <div class="group-delete-tooltip">
       <p>{{i18n "admin.groups.delete_automatic_group"}}</p>
     </div>
@@ -9,42 +9,42 @@
 
   <div class="group-details-container">
     <div class="group-info">
-      {{#if (or model.flair_icon model.flair_url model.flair_bg_color)}}
+      {{#if (or this.model.flair_icon this.model.flair_url this.model.flair_bg_color)}}
         <div class="group-avatar-flair">
-          <AvatarFlair @flairName={{model.name}} @flairUrl={{or model.flair_icon model.flair_url}} @flairBgColor={{model.flair_bg_color}} @flairColor={{model.flair_color}} />
+          <AvatarFlair @flairName={{this.model.name}} @flairUrl={{or this.model.flair_icon this.model.flair_url}} @flairBgColor={{this.model.flair_bg_color}} @flairColor={{this.model.flair_color}} />
         </div>
       {{/if}}
 
       <div class="group-info-names">
-        <span class="group-info-name">{{groupName}}</span>
+        <span class="group-info-name">{{this.groupName}}</span>
 
-        {{#if model.full_name}}<div class="group-info-full-name">{{model.name}}</div>{{/if}}
+        {{#if this.model.full_name}}<div class="group-info-full-name">{{this.model.name}}</div>{{/if}}
       </div>
 
       <div class="group-details-button">
-        <GroupMembershipButton @tagName="" @model={{model}} @showLogin={{route-action "showLogin"}} />
+        <GroupMembershipButton @tagName="" @model={{this.model}} @showLogin={{route-action "showLogin"}} />
 
-        {{#if currentUser.admin}}
-          {{#if model.automatic}}
+        {{#if this.currentUser.admin}}
+          {{#if this.model.automatic}}
             <DButton @action={{action "toggleDeleteTooltip"}} @class="btn-default" @icon="question-circle" @label="admin.groups.delete" />
           {{else}}
-            <DButton @action={{action "destroyGroup"}} @disabled={{destroying}} @icon="trash-alt" @class="btn-danger" @label="admin.groups.delete" />
+            <DButton @action={{action "destroyGroup"}} @disabled={{this.destroying}} @icon="trash-alt" @class="btn-danger" @label="admin.groups.delete" />
           {{/if}}
         {{/if}}
 
-        {{#if displayGroupMessageButton}}
+        {{#if this.displayGroupMessageButton}}
           <DButton @action={{action "messageGroup"}} @class="btn-primary group-message-button" @icon="envelope" @label="groups.message" />
         {{/if}}
       </div>
 
-      <PluginOutlet @name="group-details-after" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+      <PluginOutlet @name="group-details-after" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
     </div>
 
-    {{#if model.bio_cooked}}
+    {{#if this.model.bio_cooked}}
       <hr>
 
       <div class="group-bio">
-        <p>{{html-safe model.bio_cooked}}</p>
+        <p>{{html-safe this.model.bio_cooked}}</p>
       </div>
     {{/if}}
   </div>
@@ -52,7 +52,7 @@
   <div class="user-content-wrapper">
     <section class="user-primary-navigation">
       <div class="container">
-        <GroupNavigation @group={{model}} @currentPath={{currentPath}} @tabs={{tabs}} />
+        <GroupNavigation @group={{this.model}} @currentPath={{this.currentPath}} @tabs={{this.tabs}} />
       </div>
     </section>
 
diff --git a/app/assets/javascripts/discourse/app/templates/group/activity.hbs b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
index f6201260381..27b05cda1b5 100644
--- a/app/assets/javascripts/discourse/app/templates/group/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/activity.hbs
@@ -1,11 +1,11 @@
 <section class="user-secondary-navigation">
   <MobileNav @class="activity-nav" @desktopClass="action-list activity-list nav-stacked">
-    {{#if model.can_see_members}}
-      <GroupActivityFilter @filter="posts" @categoryId={{category_id}} />
-      <GroupActivityFilter @filter="topics" @categoryId={{category_id}} />
+    {{#if this.model.can_see_members}}
+      <GroupActivityFilter @filter="posts" @categoryId={{this.category_id}} />
+      <GroupActivityFilter @filter="topics" @categoryId={{this.category_id}} />
     {{/if}}
-    {{#if siteSettings.enable_mentions}}
-      <GroupActivityFilter @filter="mentions" @categoryId={{category_id}} />
+    {{#if this.siteSettings.enable_mentions}}
+      <GroupActivityFilter @filter="mentions" @categoryId={{this.category_id}} />
     {{/if}}
     <PluginOutlet @name="group-activity-bottom" @connectorTagName="li" />
   </MobileNav>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage.hbs b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
index b952bcba209..08e0e64a849 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage.hbs
@@ -1,8 +1,8 @@
 <section class="user-secondary-navigation">
   <MobileNav @class="activity-nav" @desktopClass="action-list activity-list nav-stacked">
-    {{#each tabs as |tab|}}
+    {{#each this.tabs as |tab|}}
       <li>
-        <LinkTo @route={{tab.route}} @model={{model.name}}>
+        <LinkTo @route={{tab.route}} @model={{this.model.name}}>
           {{i18n tab.title}}
         </LinkTo>
       </li>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/categories.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/categories.hbs
index b0020b951b8..0ceb5b6ec84 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/categories.hbs
@@ -7,7 +7,7 @@
   <div class="control-group">
     <label>{{d-icon "d-watching"}} {{i18n "groups.notifications.watching.title"}}</label>
 
-    <CategorySelector @categories={{model.watchingCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.watchingCategories)}} />
+    <CategorySelector @categories={{this.model.watchingCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.watchingCategories)}} />
 
     <div class="control-instructions">
       {{i18n "groups.manage.categories.watched_categories_instructions"}}
@@ -17,7 +17,7 @@
   <div class="control-group">
     <label>{{d-icon "d-tracking"}} {{i18n "groups.notifications.tracking.title"}}</label>
 
-    <CategorySelector @categories={{model.trackingCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.trackingCategories)}} />
+    <CategorySelector @categories={{this.model.trackingCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.trackingCategories)}} />
 
     <div class="control-instructions">
       {{i18n "groups.manage.categories.tracked_categories_instructions"}}
@@ -27,7 +27,7 @@
   <div class="control-group">
     <label>{{d-icon "d-watching-first"}} {{i18n "groups.notifications.watching_first_post.title"}}</label>
 
-    <CategorySelector @categories={{model.watchingFirstPostCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.watchingFirstPostCategories)}} />
+    <CategorySelector @categories={{this.model.watchingFirstPostCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.watchingFirstPostCategories)}} />
 
     <div class="control-instructions">
       {{i18n "groups.manage.categories.watching_first_post_categories_instructions"}}
@@ -37,7 +37,7 @@
   <div class="control-group">
     <label>{{d-icon "d-regular"}} {{i18n "groups.notifications.regular.title"}}</label>
 
-    <CategorySelector @categories={{model.regularCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.regularCategories)}} />
+    <CategorySelector @categories={{this.model.regularCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.regularCategories)}} />
 
     <div class="control-instructions">
       {{i18n "groups.manage.categories.regular_categories_instructions"}}
@@ -47,12 +47,12 @@
   <div class="control-group">
     <label>{{d-icon "d-muted"}} {{i18n "groups.notifications.muted.title"}}</label>
 
-    <CategorySelector @categories={{model.mutedCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.mutedCategories)}} />
+    <CategorySelector @categories={{this.model.mutedCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.mutedCategories)}} />
 
     <div class="control-instructions">
       {{i18n "groups.manage.categories.muted_categories_instructions"}}
     </div>
   </div>
 
-  <GroupManageSaveButton @model={{model}} />
+  <GroupManageSaveButton @model={{this.model}} />
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/email.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/email.hbs
index cc68e68dfe7..718d3769545 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/email.hbs
@@ -1 +1 @@
-<GroupManageEmailSettings @group={{model}} />
+<GroupManageEmailSettings @group={{this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs
index 14a48dcc0d0..1faa9c59f02 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/interaction.hbs
@@ -1,4 +1,4 @@
 <form class="groups-form form-vertical">
-  <GroupsFormInteractionFields @model={{model}} />
-  <GroupManageSaveButton @model={{model}} />
+  <GroupsFormInteractionFields @model={{this.model}} />
+  <GroupManageSaveButton @model={{this.model}} />
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs
index 5026681e0d2..32dc49fcd82 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/logs.hbs
@@ -1,9 +1,9 @@
-{{#if model.logs}}
+{{#if this.model.logs}}
   <div class="group-manage-logs-controls">
-    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{filters.action}} @type="action" />
-    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{filters.acting_user}} @type="acting_user" />
-    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{filters.target_user}} @type="target_user" />
-    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{filters.subject}} @type="subject" />
+    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{this.filters.action}} @type="action" />
+    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{this.filters.acting_user}} @type="acting_user" />
+    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{this.filters.target_user}} @type="target_user" />
+    <GroupManageLogsFilter @clearFilter={{action "clearFilter"}} @value={{this.filters.subject}} @type="subject" />
   </div>
 
   <LoadMore @selector=".group-manage-logs .group-manage-logs-row" @action={{action "loadMore"}}>
@@ -18,14 +18,14 @@
       </thead>
 
       <tbody>
-        {{#each model.logs as |logItem|}}
-          <GroupManageLogsRow @log={{logItem}} @filters={{filters}} />
+        {{#each this.model.logs as |logItem|}}
+          <GroupManageLogsRow @log={{logItem}} @filters={{this.filters}} />
         {{/each}}
       </tbody>
     </table>
   </LoadMore>
 
-  <ConditionalLoadingSpinner @condition={{loading}} />
+  <ConditionalLoadingSpinner @condition={{this.loading}} />
 {{else}}
   <div>{{i18n "groups.empty.logs"}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs
index 3e674156e9c..855dde88151 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/membership.hbs
@@ -1,4 +1,4 @@
 <form class="groups-form form-vertical">
-  <GroupsFormMembershipFields @model={{model}} />
-  <GroupManageSaveButton @model={{model}} />
+  <GroupsFormMembershipFields @model={{this.model}} />
+  <GroupManageSaveButton @model={{this.model}} />
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs
index d89c3f37aef..53f49c2cdb9 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/profile.hbs
@@ -1,4 +1,4 @@
 <form class="groups-form form-vertical">
-  <GroupsFormProfileFields @model={{model}} @disableSave={{saving}} />
-  <GroupManageSaveButton @model={{model}} @saving={{saving}} />
+  <GroupsFormProfileFields @model={{this.model}} @disableSave={{this.saving}} />
+  <GroupManageSaveButton @model={{this.model}} @saving={{this.saving}} />
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
index a0e25b4d63d..6c8c6ac9966 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
@@ -1,6 +1,6 @@
 <form class="groups-form form-vertical groups-notifications-form">
 
-  <PluginOutlet @name="before-manage-group-tags" @connectorTagName="div" @args={{hash model=model}} />
+  <PluginOutlet @name="before-manage-group-tags" @connectorTagName="div" @args={{hash model=this.model}} />
 
   <div class="control-group">
     <label class="control-label">{{i18n "groups.manage.tags.long_title"}}</label>
@@ -10,7 +10,7 @@
   <div class="control-group">
     <label>{{d-icon "d-watching"}} {{i18n "groups.notifications.watching.title"}}</label>
 
-    <TagChooser @tags={{model.watching_tags}} @blacklist={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+    <TagChooser @tags={{this.model.watching_tags}} @blacklist={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
         allowAny=false
       }} />
 
@@ -22,7 +22,7 @@
   <div class="control-group">
     <label>{{d-icon "d-tracking"}} {{i18n "groups.notifications.tracking.title"}}</label>
 
-    <TagChooser @tags={{model.tracking_tags}} @blacklist={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+    <TagChooser @tags={{this.model.tracking_tags}} @blacklist={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
         allowAny=false
       }} />
 
@@ -34,7 +34,7 @@
   <div class="control-group">
     <label>{{d-icon "d-watching-first"}} {{i18n "groups.notifications.watching_first_post.title"}}</label>
 
-    <TagChooser @tags={{model.watching_first_post_tags}} @blacklist={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+    <TagChooser @tags={{this.model.watching_first_post_tags}} @blacklist={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
         allowAny=false
       }} />
 
@@ -46,7 +46,7 @@
   <div class="control-group">
     <label>{{d-icon "d-regular"}} {{i18n "groups.notifications.regular.title"}}</label>
 
-    <TagChooser @tags={{model.regular_tags}} @blacklist={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+    <TagChooser @tags={{this.model.regular_tags}} @blacklist={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
         allowAny=false
       }} />
 
@@ -58,7 +58,7 @@
   <div class="control-group">
     <label>{{d-icon "d-muted"}} {{i18n "groups.notifications.muted.title"}}</label>
 
-    <TagChooser @tags={{model.muted_tags}} @blacklist={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+    <TagChooser @tags={{this.model.muted_tags}} @blacklist={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
         allowAny=false
       }} />
 
@@ -67,5 +67,5 @@
     </div>
   </div>
 
-  <GroupManageSaveButton @model={{model}} />
+  <GroupManageSaveButton @model={{this.model}} />
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/group/messages.hbs b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
index 3bf0d2f105e..e6cb31373b6 100644
--- a/app/assets/javascripts/discourse/app/templates/group/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/messages.hbs
@@ -1,12 +1,12 @@
 <section class="user-secondary-navigation">
   <MobileNav @class="messages-nav" @desktopClass="nav-stacked action-list">
     <li>
-      <LinkTo @route="group.messages.inbox" @model={{model.name}}>
+      <LinkTo @route="group.messages.inbox" @model={{this.model.name}}>
         {{i18n "user.messages.inbox"}}
       </LinkTo>
     </li>
     <li>
-      <LinkTo @route="group.messages.archive" @model={{model.name}}>
+      <LinkTo @route="group.messages.archive" @model={{this.model.name}}>
         {{i18n "user.messages.archive"}}
       </LinkTo>
     </li>
diff --git a/app/assets/javascripts/discourse/app/templates/group/permissions.hbs b/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
index f4f9d82b5ad..dda8c900e55 100644
--- a/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/permissions.hbs
@@ -1,11 +1,11 @@
 <section class="user-content">
-  {{#if model.permissions}}
+  {{#if this.model.permissions}}
     <label class="group-category-permissions-desc">
       {{i18n "groups.permissions.description"}}
     </label>
     <table class="group-category-permissions">
       <tbody>
-        {{#each model.permissions as |permission|}}
+        {{#each this.model.permissions as |permission|}}
           <tr>
             <td>{{category-link permission.category}}</td>
             <td>{{permission.description}}</td>
diff --git a/app/assets/javascripts/discourse/app/templates/groups/index.hbs b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
index e1f98d44279..56ef0d9227c 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/index.hbs
@@ -2,26 +2,26 @@
 
 <DSection @pageClass="groups">
   <div class="groups-header">
-    {{#if currentUser.can_create_group}}
+    {{#if this.currentUser.can_create_group}}
       <DButton @action={{action "new"}} @class="btn-default groups-header-new pull-right" @icon="plus" @label="admin.groups.new.title" />
     {{/if}}
 
     <div class="groups-header-filters">
-      <Input @value={{readonly filter}} @placeholderKey="groups.index.all" class="groups-header-filters-name no-blur" @input={{action "onFilterChanged" value="target.value"}} />
+      <Input @value={{readonly this.filter}} @placeholderKey="groups.index.all" class="groups-header-filters-name no-blur" @input={{action "onFilterChanged" value="target.value"}} />
 
-      <ComboBox @value={{type}} @content={{types}} @class="groups-header-filters-type" @onChange={{action (mut type)}} @options={{hash
+      <ComboBox @value={{this.type}} @content={{this.types}} @class="groups-header-filters-type" @onChange={{action (mut this.type)}} @options={{hash
           clearable=true
           none="groups.index.filter"
         }} />
     </div>
   </div>
 
-  <ConditionalLoadingSpinner @condition={{isLoading}}>
-    {{#if groups}}
+  <ConditionalLoadingSpinner @condition={{this.isLoading}}>
+    {{#if this.groups}}
       <LoadMore @selector=".groups-boxes .group-box" @action={{action "loadMore"}}>
         <div class="container">
           <div class="groups-boxes">
-            {{#each groups as |group|}}
+            {{#each this.groups as |group|}}
               <LinkTo @route="group.members" @model={{group.name}} @classNames={{concat "group-box " group.name}}>
                 <div class="group-box-inner">
                   <div class="group-info-wrapper">
@@ -75,7 +75,7 @@
         </div>
       </LoadMore>
 
-      <ConditionalLoadingSpinner @condition={{groups.loadingMore}} />
+      <ConditionalLoadingSpinner @condition={{this.groups.loadingMore}} />
     {{else}}
       <p>{{i18n "groups.index.empty"}}</p>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/groups/new.hbs b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
index d8ad9c70705..934b5da54c2 100644
--- a/app/assets/javascripts/discourse/app/templates/groups/new.hbs
+++ b/app/assets/javascripts/discourse/app/templates/groups/new.hbs
@@ -4,11 +4,11 @@
   <hr>
 
   <form class="groups-form form-vertical">
-    <GroupsFormProfileFields @model={{model}} @disableSave={{saving}}>
+    <GroupsFormProfileFields @model={{this.model}} @disableSave={{this.saving}}>
       <div class="control-group">
         <label class="control-label" for="owner-selector">{{i18n "admin.groups.add_owners"}}</label>
 
-        <EmailGroupUserChooser @class="input-xxlarge" @id="owner-selector" @value={{splitOwnerUsernames}} @onChange={{action "updateOwnerUsernames"}} @options={{hash
+        <EmailGroupUserChooser @class="input-xxlarge" @id="owner-selector" @value={{this.splitOwnerUsernames}} @onChange={{action "updateOwnerUsernames"}} @options={{hash
             filterPlaceholder="groups.selector_placeholder"
           }} />
       </div>
@@ -16,17 +16,17 @@
       <div class="control-group">
         <label class="control-label" for="member-selector">{{i18n "groups.members.title"}}</label>
 
-        <EmailGroupUserChooser @class="input-xxlarge" @id="member-selector" @value={{splitUsernames}} @onChange={{action "updateUsernames"}} @options={{hash
+        <EmailGroupUserChooser @class="input-xxlarge" @id="member-selector" @value={{this.splitUsernames}} @onChange={{action "updateUsernames"}} @options={{hash
             filterPlaceholder="groups.selector_placeholder"
           }} />
       </div>
     </GroupsFormProfileFields>
 
-    <GroupsFormMembershipFields @model={{model}} />
-    <GroupsFormInteractionFields @model={{model}} />
+    <GroupsFormMembershipFields @model={{this.model}} />
+    <GroupsFormInteractionFields @model={{this.model}} />
 
     <div class="control-group buttons">
-      <DButton @action={{action "save"}} @type="submit" @disabled={{saving}} @class="btn btn-primary group-form-save" @label="admin.groups.new.create" />
+      <DButton @action={{action "save"}} @type="submit" @disabled={{this.saving}} @class="btn btn-primary group-form-save" @label="admin.groups.new.create" />
 
       <LinkTo @route="groups">
         {{i18n "cancel"}}
diff --git a/app/assets/javascripts/discourse/app/templates/invites/show.hbs b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
index 85b23213642..825c23cd24b 100644
--- a/app/assets/javascripts/discourse/app/templates/invites/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/invites/show.hbs
@@ -1,117 +1,117 @@
 <DSection @pageClass="invite">
   <div class="container invites-show clearfix">
     <div class="login-welcome-header">
-      <h1 class="login-title">{{welcomeTitle}}</h1>
-      <img src={{wavingHandURL}} alt="" class="waving-hand">
-      {{#unless successMessage}}
+      <h1 class="login-title">{{this.welcomeTitle}}</h1>
+      <img src={{this.wavingHandURL}} alt="" class="waving-hand">
+      {{#unless this.successMessage}}
         <p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
       {{/unless}}
     </div>
 
-    <div class={{if successMessage "invite-success" "invite-form"}}>
+    <div class={{if this.successMessage "invite-success" "invite-form"}}>
       <div class="two-col">
         <div class="col-image">
-          <img src={{inviteImageUrl}} alt={{i18n "invites.emoji"}}>
+          <img src={{this.inviteImageUrl}} alt={{i18n "invites.emoji"}}>
         </div>
 
         <div class="col-form">
-          {{#if successMessage}}
+          {{#if this.successMessage}}
             <div class="success-info">
-              <p>{{html-safe successMessage}}</p>
+              <p>{{html-safe this.successMessage}}</p>
             </div>
           {{else}}
             <p>{{i18n "invites.invited_by"}}</p>
-            <p><UserInfo @user={{invitedBy}} /></p>
+            <p><UserInfo @user={{this.invitedBy}} /></p>
 
-            {{#if associateHtml}}
+            {{#if this.associateHtml}}
               <p class="create-account-associate-link">
-                {{html-safe associateHtml}}
+                {{html-safe this.associateHtml}}
               </p>
             {{/if}}
 
-            {{#unless isInviteLink}}
+            {{#unless this.isInviteLink}}
               <p class="email-message">
-                {{html-safe yourEmailMessage}}
-                {{#if showSocialLoginAvailable}}
+                {{html-safe this.yourEmailMessage}}
+                {{#if this.showSocialLoginAvailable}}
                   {{i18n "invites.social_login_available"}}
                 {{/if}}
               </p>
             {{/unless}}
 
-            {{#if externalAuthsOnly}}
+            {{#if this.externalAuthsOnly}}
               {{! authOptions are present once the user has followed the OmniAuth flow (e.g. twitter/google/etc) }}
-              {{#if authOptions}}
-                {{#unless isInviteLink}}
-                  <InputTip @validation={{emailValidation}} @id="account-email-validation" />
+              {{#if this.authOptions}}
+                {{#unless this.isInviteLink}}
+                  <InputTip @validation={{this.emailValidation}} @id="account-email-validation" />
                 {{/unless}}
               {{else}}
                 <LoginButtons @externalLogin={{action "externalLogin"}} />
               {{/if}}
             {{/if}}
 
-            {{#if discourseConnectEnabled}}
-              <a class="btn btn-primary discourse-connect raw-link" href={{ssoPath}}>
+            {{#if this.discourseConnectEnabled}}
+              <a class="btn btn-primary discourse-connect raw-link" href={{this.ssoPath}}>
                 {{i18n "continue"}}
               </a>
             {{/if}}
 
-            {{#if shouldDisplayForm}}
+            {{#if this.shouldDisplayForm}}
               <form>
-                {{#if isInviteLink}}
+                {{#if this.isInviteLink}}
                   <div class="input email-input input-group">
-                    <Input @type="email" @value={{email}} @id="new-account-email" @name="email" class={{value-entered email}} @autofocus="autofocus" @disabled={{externalAuthsOnly}} />
+                    <Input @type="email" @value={{this.email}} @id="new-account-email" @name="email" class={{value-entered this.email}} @autofocus="autofocus" @disabled={{this.externalAuthsOnly}} />
                     <label class="alt-placeholder" for="new-account-email">
                       {{i18n "user.email.title"}}
                       <span class="required">*</span>
                     </label>
-                    <InputTip @validation={{emailValidation}} @id="account-email-validation" />
+                    <InputTip @validation={{this.emailValidation}} @id="account-email-validation" />
                     <div class="instructions">{{i18n "user.email.instructions"}}</div>
                   </div>
                 {{/if}}
 
                 <div class="input username-input input-group">
-                  <Input @value={{accountUsername}} class={{value-entered accountUsername}} @id="new-account-username" @name="username" @maxlength={{maxUsernameLength}} @autocomplete="off" />
+                  <Input @value={{this.accountUsername}} class={{value-entered this.accountUsername}} @id="new-account-username" @name="username" @maxlength={{this.maxUsernameLength}} @autocomplete="off" />
                   <label class="alt-placeholder" for="new-account-username">
                     {{i18n "user.username.title"}}
                     <span class="required">*</span>
                   </label>
-                  <InputTip @validation={{usernameValidation}} @id="username-validation" />
+                  <InputTip @validation={{this.usernameValidation}} @id="username-validation" />
                   <div class="instructions">{{i18n "user.username.instructions"}}</div>
                 </div>
 
-                {{#if fullnameRequired}}
+                {{#if this.fullnameRequired}}
                   <div class="input name-input input-group">
-                    <Input @value={{accountName}} class={{value-entered accountName}} @id="new-account-name" @name="name" />
+                    <Input @value={{this.accountName}} class={{value-entered this.accountName}} @id="new-account-name" @name="name" />
                     <label class="alt-placeholder" for="new-account-name">
                       {{i18n "invites.name_label"}}
-                      {{#if siteSettings.full_name_required}}
+                      {{#if this.siteSettings.full_name_required}}
                         <span class="required">*</span>
                       {{/if}}
                     </label>
-                    <div class="instructions">{{nameInstructions}}</div>
+                    <div class="instructions">{{this.nameInstructions}}</div>
                   </div>
                 {{/if}}
 
-                {{#unless externalAuthsOnly}}
+                {{#unless this.externalAuthsOnly}}
                   <div class="input password-input input-group">
-                    <PasswordField @value={{accountPassword}} @class={{value-entered accountPassword}} @type="password" @id="new-account-password" @capsLockOn={{capsLockOn}} />
+                    <PasswordField @value={{this.accountPassword}} @class={{value-entered this.accountPassword}} @type="password" @id="new-account-password" @capsLockOn={{this.capsLockOn}} />
                     <label class="alt-placeholder" for="new-account-password">
                       {{i18n "invites.password_label"}}
                       <span class="required">*</span>
                     </label>
-                    <InputTip @validation={{passwordValidation}} />
+                    <InputTip @validation={{this.passwordValidation}} />
                     <div class="instructions">
-                      {{passwordInstructions}}
-                      <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+                      {{this.passwordInstructions}}
+                      <div class="caps-lock-warning {{unless this.capsLockOn "invisible"}}">
                         {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
                       </div>
                     </div>
                   </div>
                 {{/unless}}
 
-                {{#if userFields}}
+                {{#if this.userFields}}
                   <div class="user-fields">
-                    {{#each userFields as |f|}}
+                    {{#each this.userFields as |f|}}
                       <div class="input-group">
                         <UserField @field={{f.field}} @value={{f.value}} @class={{value-entered f.value}} />
                       </div>
@@ -119,11 +119,11 @@
                   </div>
                 {{/if}}
 
-                <DButton @class="btn-primary" @action={{action "submit"}} @type="submit" @disabled={{submitDisabled}} @label="invites.accept_invite" />
+                <DButton @class="btn-primary" @action={{action "submit"}} @type="submit" @disabled={{this.submitDisabled}} @label="invites.accept_invite" />
 
-                {{#if errorMessage}}
+                {{#if this.errorMessage}}
                   <br><br>
-                  <div class="alert alert-error">{{errorMessage}}</div>
+                  <div class="alert alert-error">{{this.errorMessage}}</div>
                 {{/if}}
               </form>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
index 56f05d87ac9..53f0ee38c61 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-only.hbs
@@ -1,23 +1,23 @@
-{{#if categories}}
-  {{#if filteredCategories}}
-    <div class="category-list {{if showTopics "with-topics"}}">
-      {{#each filteredCategories as |c|}}
-        <ParentCategoryRow @category={{c}} @showTopics={{showTopics}} />
+{{#if this.categories}}
+  {{#if this.filteredCategories}}
+    <div class="category-list {{if this.showTopics "with-topics"}}">
+      {{#each this.filteredCategories as |c|}}
+        <ParentCategoryRow @category={{c}} @showTopics={{this.showTopics}} />
       {{/each}}
     </div>
   {{/if}}
 
-  {{#if mutedCategories}}
+  {{#if this.mutedCategories}}
     <div class="muted-categories">
       <a href class="muted-categories-link" {{action "toggleShowMuted"}}>
         <h3 class="muted-categories-heading">{{i18n "categories.muted"}}</h3>
-        {{#if mutedToggleIcon}}
-          {{d-icon mutedToggleIcon}}
+        {{#if this.mutedToggleIcon}}
+          {{d-icon this.mutedToggleIcon}}
         {{/if}}
       </a>
-      <div class="category-list {{if showTopics "with-topics"}} {{unless showMutedCategories "hidden"}}">
-        {{#each mutedCategories as |c|}}
-          <ParentCategoryRow @category={{c}} @showTopics={{showTopics}} @listType="muted" />
+      <div class="category-list {{if this.showTopics "with-topics"}} {{unless this.showMutedCategories "hidden"}}">
+        {{#each this.mutedCategories as |c|}}
+          <ParentCategoryRow @category={{c}} @showTopics={{this.showTopics}} @listType="muted" />
         {{/each}}
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
index 75eaa9bb810..538c3277187 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/categories-with-featured-topics.hbs
@@ -1 +1 @@
-<CategoriesOnly @categories={{categories}} @showTopics="true" />
+<CategoriesOnly @categories={{this.categories}} @showTopics="true" />
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
index 16dbb7f8177..a880083dd92 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/directory-item.hbs
@@ -1,11 +1,11 @@
-<UserInfo @user={{item.user}} />
+<UserInfo @user={{this.item.user}} />
 
-{{#each columns as |column|}}
+{{#each this.columns as |column|}}
   {{#if (directory-column-is-user-field column=column)}}
-    {{#if (get item.user.user_fields column.user_field_id)}}
+    {{#if (get this.item.user.user_fields column.user_field_id)}}
       <div class="user-stat">
         <span class="value user-field">
-          {{directory-item-user-field-value item=item column=column}}
+          {{directory-item-user-field-value item=this.item column=column}}
         </span>
         <span class="label">
           {{column.name}}
@@ -16,18 +16,18 @@
   {{else}}
     <div class="user-stat">
       <span class="value">
-        {{directory-item-value item=item column=column}}
+        {{directory-item-value item=this.item column=column}}
       </span>
       <span class="label">
         {{#if column.icon}}
           {{d-icon column.icon}}
         {{/if}}
-        {{mobile-directory-item-label item=item column=column}}
+        {{mobile-directory-item-label item=this.item column=column}}
       </span>
     </div>
   {{/if}}
 {{/each}}
 
-{{#if showTimeRead}}
-  <UserStat @value={{item.time_read}} @label="directory.time_read" @type="duration" />
+{{#if this.showTimeRead}}
+  <UserStat @value={{this.item.time_read}} @label="directory.time_read" @type="duration" />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
index d10e5bf1c55..b062e88d042 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/mobile-nav.hbs
@@ -1,11 +1,11 @@
-{{#if selectedHtml}}
+{{#if this.selectedHtml}}
   <li>
     <a href {{action "toggleExpanded"}} class="expander">
-      <span class="selection">{{html-safe selectedHtml}}</span>
+      <span class="selection">{{html-safe this.selectedHtml}}</span>
       {{d-icon "caret-down"}}
     </a>
   </li>
 {{/if}}
-<ul class="drop {{if expanded "expanded"}}">
+<ul class="drop {{if this.expanded "expanded"}}">
   {{yield}}
 </ul>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
index b89975d8281..72e29f165f5 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/navigation-bar.hbs
@@ -1,14 +1,14 @@
 <li class="navigation-toggle">
   <a href {{action "toggleDrop"}} class="toggle-link">
-    {{selectedNavItem.displayName}}
+    {{this.selectedNavItem.displayName}}
     {{d-icon "caret-down"}}
   </a>
 </li>
-{{#if expanded}}
+{{#if this.expanded}}
   <ul class="drop">
-    {{#each navItems as |navItem|}}
-      <NavigationItem @content={{navItem}} @filterMode={{filterMode}} @category={{category}} @class={{concat "nav-item_" navItem.name}} />
+    {{#each this.navItems as |navItem|}}
+      <NavigationItem @content={{navItem}} @filterMode={{this.filterMode}} @category={{this.category}} @class={{concat "nav-item_" navItem.name}} />
     {{/each}}
-    <PluginOutlet @name="extra-nav-item" @connectorTagName="li" @args={{hash category=category filterMode=filterMode}} />
+    <PluginOutlet @name="extra-nav-item" @connectorTagName="li" @args={{hash category=this.category filterMode=this.filterMode}} />
   </ul>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
index 3a31bc04313..b281ee60d9d 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/parent-category-row.hbs
@@ -1,37 +1,37 @@
-{{#unless isHidden}}
-  <PluginOutlet @name="category-list-above-each-category" @args={{hash category=category}} />
-  <div data-category-id={{category.id}} data-notification-level={{category.notificationLevelString}} style={{border-color category.color}} class="category-list-item category {{if isMuted "muted"}}">
+{{#unless this.isHidden}}
+  <PluginOutlet @name="category-list-above-each-category" @args={{hash category=this.category}} />
+  <div data-category-id={{this.category.id}} data-notification-level={{this.category.notificationLevelString}} style={{border-color this.category.color}} class="category-list-item category {{if this.isMuted "muted"}}">
     <table class="topic-list">
       <tbody>
         <tr>
           <th class="main-link">
-            <CategoryTitleLink @category={{category}} />
+            <CategoryTitleLink @category={{this.category}} />
           </th>
         </tr>
-        {{#if category.description_excerpt}}
+        {{#if this.category.description_excerpt}}
           <tr class="category-description">
             <td colspan="3">
-              {{html-safe category.description_excerpt}}
+              {{html-safe this.category.description_excerpt}}
             </td>
           </tr>
         {{/if}}
-        {{#unless isMuted}}
-          {{#if showTopics}}
-            {{#each category.topics as |t|}}
+        {{#unless this.isMuted}}
+          {{#if this.showTopics}}
+            {{#each this.category.topics as |t|}}
               <MobileCategoryTopic @topic={{t}} />
             {{/each}}
           {{/if}}
         {{/unless}}
-        {{#if category.isGrandParent}}
-          {{#each category.subcategories as |subcategory|}}
-            <SubCategoryRow @category={{subcategory}} @listType={{listType}} />
+        {{#if this.category.isGrandParent}}
+          {{#each this.category.subcategories as |subcategory|}}
+            <SubCategoryRow @category={{subcategory}} @listType={{this.listType}} />
           {{/each}}
-        {{else if category.subcategories}}
+        {{else if this.category.subcategories}}
           <tr class="subcategories-list">
             <td>
               <div class="subcategories">
-                {{#each category.subcategories as |subcategory|}}
-                  <SubCategoryItem @category={{subcategory}} @listType={{listType}} />
+                {{#each this.category.subcategories as |subcategory|}}
+                  <SubCategoryItem @category={{subcategory}} @listType={{this.listType}} />
                 {{/each}}
               </div>
             </td>
@@ -41,14 +41,14 @@
     </table>
     <footer class="clearfix category-topics-count">
       <div class="category-stat">
-        <a href={{category.url}}>
-          {{html-safe category.statTotal}}
+        <a href={{this.category.url}}>
+          {{html-safe this.category.statTotal}}
         </a>
       </div>
-      {{#unless category.pickAll}}
+      {{#unless this.category.pickAll}}
         <div class="category-stat">
-          <a href={{category.url}}>
-            {{html-safe category.stat}}
+          <a href={{this.category.url}}>
+            {{html-safe this.category.stat}}
           </a>
         </div>
       {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-item.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-item.hbs
index 165ad436f18..8cbee9483e0 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-item.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-item.hbs
@@ -1,3 +1,3 @@
-{{#unless isMuted}}
-  {{category-link category}}
+{{#unless this.isMuted}}
+  {{category-link this.category}}
 {{/unless}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-row.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-row.hbs
index d89c3f17715..1e251be3f69 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-row.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/sub-category-row.hbs
@@ -1,12 +1,12 @@
-{{#unless isHidden}}
-  <tr data-category-id={{category.id}} style={{border-color category.color}} class="subcategory-list-item category {{if isMuted "muted"}}">
+{{#unless this.isHidden}}
+  <tr data-category-id={{this.category.id}} style={{border-color this.category.color}} class="subcategory-list-item category {{if this.isMuted "muted"}}">
     <td>
-      <CategoryTitleLink @tagName="h4" @category={{category}} />
+      <CategoryTitleLink @tagName="h4" @category={{this.category}} />
       <div class="subcategories-list">
-        {{#if category.subcategories}}
+        {{#if this.category.subcategories}}
           <div class="subcategories">
-            {{#each category.subcategories as |subcategory|}}
-              <SubCategoryItem @category={{subcategory}} @listType={{listType}} />
+            {{#each this.category.subcategories as |subcategory|}}
+              <SubCategoryItem @category={{subcategory}} @listType={{this.listType}} />
             {{/each}}
           </div>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/components/subcategories-with-featured-topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/components/subcategories-with-featured-topics.hbs
index 73f4f15d5b5..5e43199ff85 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/components/subcategories-with-featured-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/components/subcategories-with-featured-topics.hbs
@@ -1,4 +1,4 @@
-{{#each categories as |category|}}
+{{#each this.categories as |category|}}
   <div class="category-list subcategory-list with-topics">
     <div class="parent-category">
       <CategoryTitleLink @category={{category}} />
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
index e1a7871a907..5ca7b727cfd 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
@@ -1,36 +1,36 @@
-<TopicDismissButtons @position="top" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+<TopicDismissButtons @position="top" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-<DiscoveryTopicsList @model={{model}} @refresh={{action "refresh"}} @incomingCount={{topicTrackingState.incomingCount}} as |discoveryTopicList|>
-  {{#if top}}
+<DiscoveryTopicsList @model={{this.model}} @refresh={{action "refresh"}} @incomingCount={{this.topicTrackingState.incomingCount}} as |discoveryTopicList|>
+  {{#if this.top}}
     <div class="top-lists">
-      <PeriodChooser @period={{period}} @action={{action "changePeriod"}} @fullDay={{false}} />
+      <PeriodChooser @period={{this.period}} @action={{action "changePeriod"}} @fullDay={{false}} />
     </div>
   {{else}}
-    {{#if topicTrackingState.hasIncoming}}
+    {{#if this.topicTrackingState.hasIncoming}}
       <a href {{action "showInserted"}} class="alert alert-info clickable">
-        <CountI18n @key="topic_count_" @suffix={{topicTrackingState.filter}} @count={{topicTrackingState.incomingCount}} />
+        <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
       </a>
     {{/if}}
   {{/if}}
 
-  {{#if hasTopics}}
-    <TopicList @highlightLastVisited={{true}} @showPosters={{true}} @hideCategory={{model.hideCategory}} @order={{order}} @ascending={{ascending}} @topics={{model.topics}} @expandGloballyPinned={{expandGloballyPinned}} @expandAllPinned={{expandAllPinned}} @scrollOnLoad={{true}} @onScroll={{discoveryTopicList.saveScrollPosition}} @category={{category}} />
+  {{#if this.hasTopics}}
+    <TopicList @highlightLastVisited={{true}} @showPosters={{true}} @hideCategory={{this.model.hideCategory}} @order={{this.order}} @ascending={{this.ascending}} @topics={{this.model.topics}} @expandGloballyPinned={{this.expandGloballyPinned}} @expandAllPinned={{this.expandAllPinned}} @scrollOnLoad={{true}} @onScroll={{discoveryTopicList.saveScrollPosition}} @category={{this.category}} />
   {{/if}}
 </DiscoveryTopicsList>
 
 <footer class="topic-list-bottom">
-  <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
-  {{#if allLoaded}}
-    <TopicDismissButtons @position="bottom" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+  <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
+  {{#if this.allLoaded}}
+    <TopicDismissButtons @position="bottom" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-    <FooterMessage @education={{footerEducation}} @message={{footerMessage}}>
-      {{#if latest}}
-        {{#if canCreateTopicOnCategory}}
+    <FooterMessage @education={{this.footerEducation}} @message={{this.footerMessage}}>
+      {{#if this.latest}}
+        {{#if this.canCreateTopicOnCategory}}
           <DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" />
         {{/if}}
-      {{else if top}}
+      {{else if this.top}}
         <LinkTo @route="discovery.categories">{{i18n "topic.browse_all_categories"}}</LinkTo>, <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{i18n "or"}} {{i18n "filters.top.other_periods"}}
-        <TopPeriodButtons @period={{period}} @action={{action "changePeriod"}} />
+        <TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} />
       {{else}}
         <LinkTo @route="discovery.categories"> {{i18n "topic.browse_all_categories"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
index 2117f96d716..0ee34fc1cb6 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
@@ -1,18 +1,18 @@
 <section class="user-content">
-  <TextField @value={{filterInput}} @placeholderKey={{filterPlaceholder}} @autocomplete="off" @class="group-username-filter no-blur" />
+  <TextField @value={{this.filterInput}} @placeholderKey={{this.filterPlaceholder}} @autocomplete="off" @class="group-username-filter no-blur" />
 
   <div class="group-members-manage">
-    {{#if canManageGroup}}
+    {{#if this.canManageGroup}}
       <DButton @icon="plus" @label="groups.manage.add_members" @class="group-members-add" @action={{route-action "showAddMembersModal"}} />
     {{/if}}
   </div>
 
-  {{#if hasMembers}}
+  {{#if this.hasMembers}}
     <LoadMore @selector=".group-members .user-info" @action={{action "loadMore"}}>
       <div class="group-members">
-        {{#each model.members as |user|}}
+        {{#each this.model.members as |user|}}
           <div class="group-member">
-            <UserInfo @user={{user}} @skipName={{skipName}}>
+            <UserInfo @user={{user}} @skipName={{this.skipName}}>
               {{#if user.owner}}<strong class="group-owner-label">{{i18n "groups.owner"}}</strong>{{/if}}
 
               <div class="group-member-info">
@@ -25,8 +25,8 @@
                 <span class="text">{{bound-date user.last_seen_at}}</span>
               </div>
 
-              {{#if canManageGroup}}
-                <GroupMemberDropdown @member={{user}} @canAdminGroup={{model.can_admin_group}} @onChange={{action "actOnGroup" user}} />
+              {{#if this.canManageGroup}}
+                <GroupMemberDropdown @member={{user}} @canAdminGroup={{this.model.can_admin_group}} @onChange={{action "actOnGroup" user}} />
               {{/if}}
             </UserInfo>
           </div>
@@ -34,10 +34,10 @@
       </div>
     </LoadMore>
 
-    <ConditionalLoadingSpinner @condition={{loading}} />
+    <ConditionalLoadingSpinner @condition={{this.loading}} />
   {{else}}
     <br>
 
-    <div>{{i18n emptyMessageKey}}</div>
+    <div>{{i18n this.emptyMessageKey}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
index 5d2c879dbdf..2b3cad1322e 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/modal/login.hbs
@@ -1,38 +1,38 @@
-<LoginModal @loginName={{loginName}} @loginPassword={{loginPassword}} @secondFactorToken={{secondFactorToken}} @action={{action "login"}}>
+<LoginModal @loginName={{this.loginName}} @loginPassword={{this.loginPassword}} @secondFactorToken={{this.secondFactorToken}} @action={{action "login"}}>
   <PluginOutlet @name="login-before-modal-body" @connectorTagName="div" />
-  <DModalBody @class={{modalBodyClasses}}>
+  <DModalBody @class={{this.modalBodyClasses}}>
     <div class="login-welcome-header">
-      <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+      <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{this.wavingHandURL}} alt="" class="waving-hand">
       <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
     </div>
-    {{#if showLoginButtons}}
+    {{#if this.showLoginButtons}}
       <LoginButtons @externalLogin={{action "externalLogin"}} />
     {{/if}}
 
-    {{#if canLoginLocal}}
+    {{#if this.canLoginLocal}}
       <form id="login-form" method="post">
-        <div id="credentials" class={{credentialsClass}}>
+        <div id="credentials" class={{this.credentialsClass}}>
           <div class="input-group">
-            <Input @value={{loginName}} class={{value-entered loginName}} @type="email" @id="login-account-name" @autocorrect="off" @autocapitalize="off" @disabled={{showSecondFactor}} @autofocus="autofocus" />
+            <Input @value={{this.loginName}} class={{value-entered this.loginName}} @type="email" @id="login-account-name" @autocorrect="off" @autocapitalize="off" @disabled={{this.showSecondFactor}} @autofocus="autofocus" />
             <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
-            {{#if showLoginWithEmailLink}}
-              <a href id="email-login-link" {{action (unless processingEmailLink "emailLogin")}}>
+            {{#if this.showLoginWithEmailLink}}
+              <a href id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
                 {{i18n "email_login.login_link"}}
               </a>
             {{/if}}
           </div>
           <div class="input-group">
-            <Input @value={{loginPassword}} class={{value-entered loginPassword}} @type="password" @id="login-account-password" @maxlength="200" @disabled={{showSecondFactor}} />
+            <Input @value={{this.loginPassword}} class={{value-entered this.loginPassword}} @type="password" @id="login-account-password" @maxlength="200" @disabled={{this.showSecondFactor}} />
             <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
             <a href id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n "forgot_password.action"}}</a>
           </div>
         </div>
-        <SecondFactorForm @secondFactorMethod={{secondFactorMethod}} @secondFactorToken={{secondFactorToken}} @class={{secondFactorClass}} @backupEnabled={{backupEnabled}} @isLogin={{true}}>
-          {{#if showSecurityKey}}
-            <SecurityKeyForm @allowedCredentialIds={{securityKeyAllowedCredentialIds}} @challenge={{securityKeyChallenge}} @showSecurityKey={{showSecurityKey}} @showSecondFactor={{showSecondFactor}} @secondFactorMethod={{secondFactorMethod}} @otherMethodAllowed={{otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
+        <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @class={{this.secondFactorClass}} @backupEnabled={{this.backupEnabled}} @isLogin={{true}}>
+          {{#if this.showSecurityKey}}
+            <SecurityKeyForm @allowedCredentialIds={{this.securityKeyAllowedCredentialIds}} @challenge={{this.securityKeyChallenge}} @showSecurityKey={{this.showSecurityKey}} @showSecondFactor={{this.showSecondFactor}} @secondFactorMethod={{this.secondFactorMethod}} @otherMethodAllowed={{this.otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
             </SecurityKeyForm>
           {{else}}
-            <SecondFactorInput @value={{secondFactorToken}} @inputId="login-second-factor" @secondFactorMethod={{secondFactorMethod}} @backupEnabled={{backupEnabled}} />
+            <SecondFactorInput @value={{this.secondFactorToken}} @inputId="login-second-factor" @secondFactorMethod={{this.secondFactorMethod}} @backupEnabled={{this.backupEnabled}} />
           {{/if}}
         </SecondFactorForm>
       </form>
@@ -41,12 +41,12 @@
   </DModalBody>
 
   <div class="modal-footer">
-    {{#if canLoginLocal}}
-      {{#unless showSecurityKey }}
-        <DButton @action={{action "login"}} @id="login-button" @icon="unlock" @label={{loginButtonLabel}} @disabled={{loginDisabled}} @class="btn-large btn-primary" />
+    {{#if this.canLoginLocal}}
+      {{#unless this.showSecurityKey }}
+        <DButton @action={{action "login"}} @id="login-button" @icon="unlock" @label={{this.loginButtonLabel}} @disabled={{this.loginDisabled}} @class="btn-large btn-primary" />
       {{/unless}}
 
-      {{#if showSignupLink}}
+      {{#if this.showSignupLink}}
         <DButton @class="btn-large" @id="new-account-link" @action={{route-action "showCreateAccount"}} @label="create_account.title" />
       {{/if}}
     {{/if}}
@@ -54,5 +54,5 @@
 
   <PluginOutlet @name="login-after-modal-footer" @connectorTagName="div" />
 
-  <div class={{alertClass}} id="login-alert">{{alert}}</div>
+  <div class={{this.alertClass}} id="login-alert">{{this.alert}}</div>
 </LoginModal>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
index 3117bd9c9bd..3d3c33de336 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/users.hbs
@@ -1,34 +1,34 @@
 <LoadMore @selector=".directory .user" @action={{action "loadMore"}}>
   <div class="container">
     <div class="users-directory directory">
-      <PluginOutlet @name="users-top" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+      <PluginOutlet @name="users-top" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
       <div class="directory-controls">
-        <PeriodChooser @period={{period}} @onChange={{action (mut period)}} @fullDay={{false}} />
-        {{#if lastUpdatedAt}}
+        <PeriodChooser @period={{this.period}} @onChange={{action (mut this.period)}} @fullDay={{false}} />
+        {{#if this.lastUpdatedAt}}
           <div class="directory-last-updated">
             {{i18n "directory.last_updated"}}
-            {{lastUpdatedAt}}
+            {{this.lastUpdatedAt}}
           </div>
         {{/if}}
         <div class="inline-form full-width">
-          <Input @value={{readonly nameInput}} @input={{action "onUsernameFilterChanged" value="target.value"}} @placeholderKey="directory.filter_name" class="filter-name no-blur" />
-          <ComboBox @class="directory-group-selector" @value={{group}} @content={{groupOptions}} @onChange={{action groupChanged}} @options={{hash none="directory.group.all"}} />
-          {{#if currentUser.staff}}
+          <Input @value={{readonly this.nameInput}} @input={{action "onUsernameFilterChanged" value="target.value"}} @placeholderKey="directory.filter_name" class="filter-name no-blur" />
+          <ComboBox @class="directory-group-selector" @value={{this.group}} @content={{this.groupOptions}} @onChange={{action this.groupChanged}} @options={{hash none="directory.group.all"}} />
+          {{#if this.currentUser.staff}}
             <DButton @icon="wrench" @action={{action "showEditColumnsModal"}} @class="btn-default open-edit-columns-btn" />
           {{/if}}
         </div>
-        <PluginOutlet @name="users-directory-controls" @args={{hash model=model}} />
+        <PluginOutlet @name="users-directory-controls" @args={{hash model=this.model}} />
       </div>
 
-      <ConditionalLoadingSpinner @condition={{isLoading}}>
-        {{#if model.length}}
-          <div class="total-rows">{{i18n "directory.total_rows" count=model.totalRows}}</div>
-          {{#each model as |item|}}
-            <DirectoryItem @tagName="div" @class="user" @item={{item}} @columns={{columns}} @showTimeRead={{showTimeRead}} />
+      <ConditionalLoadingSpinner @condition={{this.isLoading}}>
+        {{#if this.model.length}}
+          <div class="total-rows">{{i18n "directory.total_rows" count=this.model.totalRows}}</div>
+          {{#each this.model as |item|}}
+            <DirectoryItem @tagName="div" @class="user" @item={{item}} @columns={{this.columns}} @showTimeRead={{this.showTimeRead}} />
           {{/each}}
 
-          <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+          <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
         {{else}}
           <div class="clearfix"></div>
           <p>{{i18n "directory.no_results"}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/modal.hbs b/app/assets/javascripts/discourse/app/templates/modal.hbs
index 11092780411..02587d64f63 100644
--- a/app/assets/javascripts/discourse/app/templates/modal.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal.hbs
@@ -1,3 +1,3 @@
-<DModal @modalClass={{modalClass}} @title={{title}} @titleAriaElementId={{titleAriaElementId}} @subtitle={{subtitle}} @panels={{panels}} @selectedPanel={{selectedPanel}} @onSelectPanel={{onSelectPanel}} @class="hidden" @errors={{errors}} @closeModal={{route-action "closeModal"}}>
+<DModal @modalClass={{this.modalClass}} @title={{this.title}} @titleAriaElementId={{this.titleAriaElementId}} @subtitle={{this.subtitle}} @panels={{this.panels}} @selectedPanel={{this.selectedPanel}} @onSelectPanel={{this.onSelectPanel}} @class="hidden" @errors={{this.errors}} @closeModal={{route-action "closeModal"}}>
   {{outlet "modalBody"}}
 </DModal>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
index a378a5da9a0..6abd5a5ca1b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/activation-edit.hbs
@@ -1,8 +1,8 @@
 <DModalBody>
-  <ActivationEmailForm @email={{newEmail}} />
+  <ActivationEmailForm @email={{this.newEmail}} />
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "changeEmail"}} @label="login.submit_new_email" @disabled={{submitDisabled}} @class="btn-primary" />
+  <DButton @action={{action "changeEmail"}} @label="login.submit_new_email" @disabled={{this.submitDisabled}} @class="btn-primary" />
   <DButton @action={{route-action "closeModal"}} @label="close" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
index 650caef45c2..fe861639416 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/activation-resent.hbs
@@ -1,5 +1,5 @@
 <DModalBody>
-  {{html-safe (i18n "login.sent_activation_email_again" currentEmail=currentEmail)}}
+  {{html-safe (i18n "login.sent_activation_email_again" currentEmail=this.currentEmail)}}
 </DModalBody>
 
 <ModalFooterClose @closeModal={{route-action "closeModal"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
index c8364fdabef..8f31348f299 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/associate-account-confirm.hbs
@@ -1,28 +1,28 @@
 <DModalBody @rawTitle={{i18n "user.associated_accounts.confirm_modal_title"
-      provider=(i18n (concat "login." model.provider_name ".name"))
+      provider=(i18n (concat "login." this.model.provider_name ".name"))
     }}>
-  {{#if model.error}}
+  {{#if this.model.error}}
     <div class="alert alert-error">
-      {{model.error}}
+      {{this.model.error}}
     </div>
   {{/if}}
 
-  {{#if model.existing_account_description}}
+  {{#if this.model.existing_account_description}}
     <p>
       {{i18n "user.associated_accounts.confirm_description.disconnect"
-          provider=(i18n (concat "login." model.provider_name ".name"))
-          account_description=model.existing_account_description}}
+          provider=(i18n (concat "login." this.model.provider_name ".name"))
+          account_description=this.model.existing_account_description}}
     </p>
   {{/if}}
 
   <p>
-    {{#if model.account_description}}
+    {{#if this.model.account_description}}
       {{i18n "user.associated_accounts.confirm_description.account_specific"
-          provider=(i18n (concat "login." model.provider_name ".name"))
-          account_description=model.account_description}}
+          provider=(i18n (concat "login." this.model.provider_name ".name"))
+          account_description=this.model.account_description}}
     {{else}}
       {{i18n "user.associated_accounts.confirm_description.generic"
-          provider=(i18n (concat "login." model.provider_name ".name"))}}
+          provider=(i18n (concat "login." this.model.provider_name ".name"))}}
     {{/if}}
   </p>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
index 28d7007a212..86310ecef24 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/auth-token.hbs
@@ -7,23 +7,23 @@
   <div>
     <h3>{{i18n "user.auth_tokens.details"}}</h3>
     <ul style="list-style-type:none">
-      <li>{{d-icon "far-clock"}} {{format-date model.seen_at}}</li>
-      <li>{{d-icon "map-marker-alt"}} {{model.location}}</li>
-      <li>{{d-icon model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=model.browser device=model.device}}</li>
+      <li>{{d-icon "far-clock"}} {{format-date this.model.seen_at}}</li>
+      <li>{{d-icon "map-marker-alt"}} {{this.model.location}}</li>
+      <li>{{d-icon this.model.icon}} {{i18n "user.auth_tokens.browser_and_device" browser=this.model.browser device=this.model.device}}</li>
     </ul>
   </div>
 
-  {{#if latest_post}}
+  {{#if this.latest_post}}
     <div>
       <h3>
         {{i18n "user.auth_tokens.latest_post"}}
-        <a href {{action "toggleExpanded"}}>{{d-icon (if expanded "caret-up" "caret-down")}}</a>
+        <a href {{action "toggleExpanded"}}>{{d-icon (if this.expanded "caret-up" "caret-down")}}</a>
       </h3>
 
-      {{#if expanded}}
-        <blockquote>{{html-safe latest_post.cooked}}</blockquote>
+      {{#if this.expanded}}
+        <blockquote>{{html-safe this.latest_post.cooked}}</blockquote>
       {{else}}
-        <blockquote>{{html-safe latest_post.excerpt}}</blockquote>
+        <blockquote>{{html-safe this.latest_post.excerpt}}</blockquote>
       {{/if}}
     </div>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
index a63759bdd5a..d8447cfc13f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/avatar-selector.hbs
@@ -1,57 +1,57 @@
 <DModalBody @title="user.change_avatar.title" @class="avatar-selector">
-  {{#if showSelectableAvatars}}
+  {{#if this.showSelectableAvatars}}
     <div class="selectable-avatars">
-      {{#each selectableAvatars as |avatar|}}
+      {{#each this.selectableAvatars as |avatar|}}
         <a href class="selectable-avatar" {{action "selectAvatar" avatar}}>
           {{bound-avatar-template avatar "huge"}}
         </a>
       {{/each}}
     </div>
-    {{#if showAvatarUploader}}
+    {{#if this.showAvatarUploader}}
       <h4>{{html-safe (i18n "user.change_avatar.use_custom")}}</h4>
     {{/if}}
   {{/if}}
-  {{#if showAvatarUploader}}
-    {{#if user.use_logo_small_as_avatar}}
+  {{#if this.showAvatarUploader}}
+    {{#if this.user.use_logo_small_as_avatar}}
       <div class="avatar-choice">
-        <RadioButton @id="logo-small" @name="logo" @value="logo" @selection={{selected}} />
-        <label class="radio" for="logo-small">{{bound-avatar-template siteSettings.site_logo_small_url "large"}} {{html-safe (i18n "user.change_avatar.logo_small")}}</label>
+        <RadioButton @id="logo-small" @name="logo" @value="logo" @selection={{this.selected}} />
+        <label class="radio" for="logo-small">{{bound-avatar-template this.siteSettings.site_logo_small_url "large"}} {{html-safe (i18n "user.change_avatar.logo_small")}}</label>
       </div>
     {{/if}}
     <div class="avatar-choice">
-      <RadioButton @id="system-avatar" @name="avatar" @value="system" @selection={{selected}} />
-      <label class="radio" for="system-avatar">{{bound-avatar-template user.system_avatar_template "large"}} {{html-safe (i18n "user.change_avatar.letter_based")}}</label>
+      <RadioButton @id="system-avatar" @name="avatar" @value="system" @selection={{this.selected}} />
+      <label class="radio" for="system-avatar">{{bound-avatar-template this.user.system_avatar_template "large"}} {{html-safe (i18n "user.change_avatar.letter_based")}}</label>
     </div>
-    {{#if allowAvatarUpload}}
+    {{#if this.allowAvatarUpload}}
       <div class="avatar-choice">
-        <RadioButton @id="gravatar" @name="avatar" @value="gravatar" @selection={{selected}} />
-        <label class="radio" for="gravatar">{{bound-avatar-template user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n "user.change_avatar.gravatar" gravatarName=gravatarName gravatarBaseUrl=gravatarBaseUrl gravatarLoginUrl=gravatarLoginUrl)}} {{user.email}}</span></label>
+        <RadioButton @id="gravatar" @name="avatar" @value="gravatar" @selection={{this.selected}} />
+        <label class="radio" for="gravatar">{{bound-avatar-template this.user.gravatar_avatar_template "large"}} <span>{{html-safe (i18n "user.change_avatar.gravatar" gravatarName=this.gravatarName gravatarBaseUrl=this.gravatarBaseUrl gravatarLoginUrl=this.gravatarLoginUrl)}} {{this.user.email}}</span></label>
 
-        <DButton @action={{action "refreshGravatar"}} @translatedTitle={{i18n "user.change_avatar.refresh_gravatar_title" gravatarName=gravatarName}} @disabled={{gravatarRefreshDisabled}} @icon="sync" @class="btn-default avatar-selector-refresh-gravatar" />
+        <DButton @action={{action "refreshGravatar"}} @translatedTitle={{i18n "user.change_avatar.refresh_gravatar_title" gravatarName=this.gravatarName}} @disabled={{this.gravatarRefreshDisabled}} @icon="sync" @class="btn-default avatar-selector-refresh-gravatar" />
 
-        {{#if gravatarFailed}}
-          <p class="error">{{I18n "user.change_avatar.gravatar_failed" gravatarName=gravatarName}}</p>
+        {{#if this.gravatarFailed}}
+          <p class="error">{{I18n "user.change_avatar.gravatar_failed" gravatarName=this.gravatarName}}</p>
         {{/if}}
       </div>
       <div class="avatar-choice">
-        <RadioButton @id="uploaded-avatar" @name="avatar" @value="custom" @selection={{selected}} />
+        <RadioButton @id="uploaded-avatar" @name="avatar" @value="custom" @selection={{this.selected}} />
         <label class="radio" for="uploaded-avatar">
-          {{#if user.custom_avatar_template}}
-            {{bound-avatar-template user.custom_avatar_template "large"}}
+          {{#if this.user.custom_avatar_template}}
+            {{bound-avatar-template this.user.custom_avatar_template "large"}}
             {{i18n "user.change_avatar.uploaded_avatar"}}
           {{else}}
             {{i18n "user.change_avatar.uploaded_avatar_empty"}}
           {{/if}}
         </label>
-        <AvatarUploader @user_id={{user.id}} @uploadedAvatarTemplate={{user.custom_avatar_template}} @uploadedAvatarId={{user.custom_avatar_upload_id}} @uploading={{uploading}} @class="avatar-uploader" @id="avatar-uploader" @done={{action "uploadComplete"}} />
+        <AvatarUploader @user_id={{this.user.id}} @uploadedAvatarTemplate={{this.user.custom_avatar_template}} @uploadedAvatarId={{this.user.custom_avatar_upload_id}} @uploading={{this.uploading}} @class="avatar-uploader" @id="avatar-uploader" @done={{action "uploadComplete"}} />
       </div>
     {{/if}}
   {{/if}}
 </DModalBody>
 
-{{#if showAvatarUploader}}
+{{#if this.showAvatarUploader}}
   <div class="modal-footer">
-    <DButton @action={{action "saveAvatarSelection"}} @class="btn-primary" @disabled={{submitDisabled}} @label="save" />
+    <DButton @action={{action "saveAvatarSelection"}} @class="btn-primary" @disabled={{this.submitDisabled}} @label="save" />
     <DModalCancel @close={{route-action "closeModal"}} />
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
index 18c2b327427..2109618df16 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bookmark.hbs
@@ -1,3 +1,3 @@
 <DModalBody @id="bookmark-reminder-modal">
-  <Bookmark @model={{model}} @afterSave={{afterSave}} @afterDelete={{afterDelete}} @onCloseWithoutSaving={{onCloseWithoutSaving}} @registerOnCloseHandler={{action "registerOnCloseHandler"}} @closeModal={{action "closeModal"}} />
+  <Bookmark @model={{this.model}} @afterSave={{this.afterSave}} @afterDelete={{this.afterDelete}} @onCloseWithoutSaving={{this.onCloseWithoutSaving}} @registerOnCloseHandler={{action "registerOnCloseHandler"}} @closeModal={{action "closeModal"}} />
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
index 32979326694..bf1ee8cfeb8 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-actions-buttons.hbs
@@ -1,5 +1,5 @@
 <div class="bulk-buttons">
-  {{#each buttons as |button|}}
+  {{#each this.buttons as |button|}}
     <DButton @action={{action button.action}} @label={{button.label}} @icon={{button.icon}} @class={{button.class}} />
   {{/each}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
index a8a8cdbce25..b39c4817590 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-change-category.hbs
@@ -1,9 +1,9 @@
 <p>{{i18n "topics.bulk.choose_new_category"}}</p>
 
 <p>
-  <CategoryChooser @value={{newCategoryId}} @onChange={{action (mut newCategoryId)}} />
+  <CategoryChooser @value={{this.newCategoryId}} @onChange={{action (mut this.newCategoryId)}} />
 </p>
 
-<ConditionalLoadingSpinner @condition={{loading}}>
+<ConditionalLoadingSpinner @condition={{this.loading}}>
   <DButton @action={{action "changeCategory"}} @label="topics.bulk.change_category" />
 </ConditionalLoadingSpinner>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
index cc5eeb579ea..f4ebc0861ba 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-notification-level.hbs
@@ -1,12 +1,12 @@
 <div class="bulk-notification-list">
-  {{#each notificationLevels as |level|}}
+  {{#each this.notificationLevels as |level|}}
     <div class="controls">
       <label class="radio notification-level-radio">
-        <RadioButton @value={{level.id}} @name="notification_level" @selection={{notificationLevelId}} /> <strong>{{level.name}}</strong>
+        <RadioButton @value={{level.id}} @name="notification_level" @selection={{this.notificationLevelId}} /> <strong>{{level.name}}</strong>
         <div class="description">{{html-safe level.description}}</div>
       </label>
     </div>
   {{/each}}
 </div>
 
-<DButton @disabled={{disabled}} @action={{action "changeNotificationLevel"}} @label="topics.bulk.change_notification_level" />
+<DButton @disabled={{this.disabled}} @action={{action "changeNotificationLevel"}} @label="topics.bulk.change_notification_level" />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs b/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs
index 8fb41beeeeb..5bfb4efb4ab 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/bulk-progress.hbs
@@ -1 +1 @@
-<p>{{html-safe (i18n "topics.bulk.progress" count=processedTopicCount)}}</p>
+<p>{{html-safe (i18n "topics.bulk.progress" count=this.processedTopicCount)}}</p>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
index d913d9c6ac6..4e0582c28b3 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
@@ -1,15 +1,15 @@
 <DModalBody @class="change-ownership">
   <span>
-    {{html-safe (i18n (if selectedPostsUsername "topic.change_owner.instructions" "topic.change_owner.instructions_without_old_user")
-        count=selectedPostsCount
-        old_user=selectedPostsUsername
+    {{html-safe (i18n (if this.selectedPostsUsername "topic.change_owner.instructions" "topic.change_owner.instructions_without_old_user")
+        count=this.selectedPostsCount
+        old_user=this.selectedPostsUsername
       )
     }}
   </span>
 
   <form>
     <label></label>
-    <EmailGroupUserChooser @value={{newOwner}} @autofocus={{true}} @onChange={{action "updateNewOwner"}} @options={{hash
+    <EmailGroupUserChooser @value={{this.newOwner}} @autofocus={{true}} @onChange={{action "updateNewOwner"}} @options={{hash
         maximum=1
         filterPlaceholder="topic.change_owner.placeholder"
       }} />
@@ -17,5 +17,5 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @action={{action "changeOwnershipOfPosts"}} @disabled={{buttonDisabled}} @label={{if saving "saving" "topic.change_owner.action"}} />
+  <DButton @class="btn-primary" @action={{action "changeOwnershipOfPosts"}} @disabled={{this.buttonDisabled}} @label={{if this.saving "saving" "topic.change_owner.action"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
index 50b066aa22f..177a5b7770b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-post-notice.hbs
@@ -1,11 +1,11 @@
-<DModalBody @title={{if model.notice "post.controls.change_post_notice" "post.controls.add_post_notice"}}>
-  <form><Textarea @value={{notice}} /></form>
+<DModalBody @title={{if this.model.notice "post.controls.change_post_notice" "post.controls.add_post_notice"}}>
+  <form><Textarea @value={{this.notice}} /></form>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @label={{if saving "saving" "save"}} @action={{action "setNotice" notice}} @disabled={{disabled}} />
-  {{#if model.notice}}
-    <DButton @class="btn-danger" @label="post.controls.delete_post_notice" @action={{action "setNotice"}} @disabled={{saving}} />
+  <DButton @class="btn-primary" @label={{if this.saving "saving" "save"}} @action={{action "setNotice" this.notice}} @disabled={{this.disabled}} />
+  {{#if this.model.notice}}
+    <DButton @class="btn-danger" @label="post.controls.delete_post_notice" @action={{action "setNotice"}} @disabled={{this.saving}} />
   {{/if}}
   <DModalCancel @close={{route-action "closeModal"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs
index 4b918dee3c3..7348fd3f752 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-timestamp.hbs
@@ -3,19 +3,19 @@
     {{i18n "topic.change_timestamp.instructions"}}
   </p>
 
-  <p class="alert alert-error {{unless validTimestamp "hidden"}}">
+  <p class="alert alert-error {{unless this.validTimestamp "hidden"}}">
     {{i18n "topic.change_timestamp.invalid_timestamp"}}
   </p>
 
   <form>
-    <DatePickerPast @value={{readonly date}} @containerId="date-container" @onSelect={{action (mut date)}} />
+    <DatePickerPast @value={{readonly this.date}} @containerId="date-container" @onSelect={{action (mut this.date)}} />
 
-    <Input @type="time" @value={{time}} />
+    <Input @type="time" @value={{this.time}} />
   </form>
 
   <div id="date-container"></div>
 </DModalBody>
 
 <div class="modal-footer change-timestamp-footer">
-  <DButton @class="btn-primary" @disabled={{buttonDisabled}} @action={{action "changeTimestamp"}} @translatedLabel={{buttonTitle}} />
+  <DButton @class="btn-primary" @disabled={{this.buttonDisabled}} @action={{action "changeTimestamp"}} @translatedLabel={{this.buttonTitle}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs
index 7ddf3e0d025..4d00a6673af 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/convert-to-public-topic.hbs
@@ -3,11 +3,11 @@
   <div class="instructions">
     {{i18n "topic.make_public.choose_category"}}
   </div>
-  <CategoryChooser @value={{publicCategoryId}} @onChange={{action (mut publicCategoryId)}} />
+  <CategoryChooser @value={{this.publicCategoryId}} @onChange={{action (mut this.publicCategoryId)}} />
 
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @action={{action "makePublic"}} @label="composer.modal_ok" @disabled={{saving}} />
+  <DButton @class="btn-primary" @action={{action "makePublic"}} @label="composer.modal_ok" @disabled={{this.saving}} />
   <DModalCancel @close={{route-action "closeModal"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
index 9befefccb7e..90159107333 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-account.hbs
@@ -1,113 +1,113 @@
-<CreateAccount @email={{accountEmail}} @disabled={{submitDisabled}} @action={{action "createAccount"}}>
-  {{#unless complete}}
+<CreateAccount @email={{this.accountEmail}} @disabled={{this.submitDisabled}} @action={{action "createAccount"}}>
+  {{#unless this.complete}}
     <PluginOutlet @name="create-account-before-modal-body" @tagName="span" @connectorTagName="div" />
-    <DModalBody @class={{modalBodyClasses}} @preventModalAlertHiding={{true}}>
+    <DModalBody @class={{this.modalBodyClasses}} @preventModalAlertHiding={{true}}>
       <div class="create-account-form">
         <div class="login-welcome-header" id="create-account-title">
-          <h1 class="login-title">{{i18n "create_account.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+          <h1 class="login-title">{{i18n "create_account.header_title"}}</h1> <img src={{this.wavingHandURL}} alt="" class="waving-hand">
           <p class="login-subheader">{{i18n "create_account.subheader_title"}}</p>
         </div>
-        {{#if showCreateForm}}
+        {{#if this.showCreateForm}}
 
           <div class="login-form">
             <form>
-              {{#if associateHtml}}
+              {{#if this.associateHtml}}
                 <div class="input-group create-account-associate-link">
-                  <span>{{html-safe associateHtml}}</span>
+                  <span>{{html-safe this.associateHtml}}</span>
                 </div>
               {{/if}}
               <div class="input-group create-account-email">
-                <Input @type="email" @disabled={{emailDisabled}} @value={{accountEmail}} @id="new-account-email" @name="email" class={{value-entered accountEmail}} @autofocus="autofocus" @focusOut={{action "checkEmailAvailability"}} @aria-describedby="account-email-validation" @aria-invalid={{emailValidation.failed}} />
+                <Input @type="email" @disabled={{this.emailDisabled}} @value={{this.accountEmail}} @id="new-account-email" @name="email" class={{value-entered this.accountEmail}} @autofocus="autofocus" @focusOut={{action "checkEmailAvailability"}} @aria-describedby="account-email-validation" @aria-invalid={{this.emailValidation.failed}} />
                 <label class="alt-placeholder" for="new-account-email">
                   {{i18n "user.email.title"}}
-                  {{~#if userFields~}}
+                  {{~#if this.userFields~}}
                     <span class="required">*</span>
                   {{/if}}
                 </label>
-                <InputTip @validation={{emailValidation}} @id="account-email-validation" />
+                <InputTip @validation={{this.emailValidation}} @id="account-email-validation" />
                 <span class="more-info">{{i18n "user.email.instructions"}}</span>
               </div>
 
               <div class="input-group">
-                <Input @value={{accountUsername}} @disabled={{usernameDisabled}} class={{value-entered accountUsername}} @id="new-account-username" @name="username" @maxlength={{maxUsernameLength}} @aria-describedby="username-validation" @aria-invalid={{usernameValidation.failed}} @autocomplete="off" />
+                <Input @value={{this.accountUsername}} @disabled={{this.usernameDisabled}} class={{value-entered this.accountUsername}} @id="new-account-username" @name="username" @maxlength={{this.maxUsernameLength}} @aria-describedby="username-validation" @aria-invalid={{this.usernameValidation.failed}} @autocomplete="off" />
                 <label class="alt-placeholder" for="new-account-username">
                   {{i18n "user.username.title"}}
-                  {{~#if userFields~}}
+                  {{~#if this.userFields~}}
                     <span class="required">*</span>
                   {{/if}}
                 </label>
 
-                <InputTip @validation={{usernameValidation}} @id="username-validation" />
+                <InputTip @validation={{this.usernameValidation}} @id="username-validation" />
                 <span class="more-info">{{i18n "user.username.instructions"}}</span>
               </div>
 
               <div class="input-group">
-                {{#if fullnameRequired}}
-                  <TextField @disabled={{nameDisabled}} @value={{accountName}} @id="new-account-name" @class={{value-entered accountName}} @aria-describedby="fullname-validation" @aria-invalid={{nameValidation.failed}} />
+                {{#if this.fullnameRequired}}
+                  <TextField @disabled={{this.nameDisabled}} @value={{this.accountName}} @id="new-account-name" @class={{value-entered this.accountName}} @aria-describedby="fullname-validation" @aria-invalid={{this.nameValidation.failed}} />
                   <label class="alt-placeholder" for="new-account-name">
                     {{i18n "user.name.title"}}
-                    {{#if siteSettings.full_name_required}}
-                      {{~#if userFields~}}
+                    {{#if this.siteSettings.full_name_required}}
+                      {{~#if this.userFields~}}
                         <span class="required">*</span>
                       {{/if}}
                     {{/if}}
                   </label>
 
-                  <InputTip @validation={{nameValidation}} @id="fullname-validation" />
-                  <span class="more-info">{{nameInstructions}}</span>
+                  <InputTip @validation={{this.nameValidation}} @id="fullname-validation" />
+                  <span class="more-info">{{this.nameInstructions}}</span>
                 {{/if}}
               </div>
 
               <PluginOutlet @name="create-account-before-password" @args={{hash
-                    accountName=accountName
-                    accountUsername=accountUsername
-                    accountPassword=accountPassword
-                    userFields=userFields
-                    authOptions=authOptions
+                    accountName=this.accountName
+                    accountUsername=this.accountUsername
+                    accountPassword=this.accountPassword
+                    userFields=this.userFields
+                    authOptions=this.authOptions
                   }} />
 
               <div class="input-group">
-                {{#if passwordRequired}}
-                  <PasswordField @value={{accountPassword}} @class={{value-entered accountPassword}} @type="password" @id="new-account-password" @autocomplete="current-password" @capsLockOn={{capsLockOn}} @aria-describedby="password-validation" @aria-invalid={{passwordValidation.failed}} />
+                {{#if this.passwordRequired}}
+                  <PasswordField @value={{this.accountPassword}} @class={{value-entered this.accountPassword}} @type="password" @id="new-account-password" @autocomplete="current-password" @capsLockOn={{this.capsLockOn}} @aria-describedby="password-validation" @aria-invalid={{this.passwordValidation.failed}} />
                   <label class="alt-placeholder" for="new-account-password">
                     {{i18n "user.password.title"}}
-                    {{~#if userFields~}}
+                    {{~#if this.userFields~}}
                       <span class="required">*</span>
                     {{/if}}
                   </label>
 
-                  <InputTip @validation={{passwordValidation}} @id="password-validation" />
-                  <span class="more-info">{{passwordInstructions}}</span>
-                  <div class="caps-lock-warning {{unless capsLockOn " hidden"}}">
+                  <InputTip @validation={{this.passwordValidation}} @id="password-validation" />
+                  <span class="more-info">{{this.passwordInstructions}}</span>
+                  <div class="caps-lock-warning {{unless this.capsLockOn " hidden"}}">
                     {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
                   </div>
                 {{/if}}
 
                 <div class="password-confirmation">
                   <label for="new-account-password-confirmation">{{i18n "user.password_confirmation.title"}}</label>
-                  <HoneypotInput @id="new-account-confirmation" @autocomplete="new-password" @value={{accountHoneypot}} />
-                  <Input @value={{accountChallenge}} @id="new-account-challenge" />
+                  <HoneypotInput @id="new-account-confirmation" @autocomplete="new-password" @value={{this.accountHoneypot}} />
+                  <Input @value={{this.accountChallenge}} @id="new-account-challenge" />
                 </div>
               </div>
 
-              {{#if requireInviteCode }}
+              {{#if this.requireInviteCode }}
                 <div class="input-group">
-                  <Input @value={{inviteCode}} class={{value-entered inviteCode}} @id="inviteCode" />
+                  <Input @value={{this.inviteCode}} class={{value-entered this.inviteCode}} @id="inviteCode" />
                   <label class="alt-placeholder" for="invite-code">{{i18n "user.invite_code.title"}}</label>
                   <span class="more-info">{{i18n "user.invite_code.instructions"}}</span>
                 </div>
               {{/if}}
 
               <PluginOutlet @name="create-account-after-password" @args={{hash
-                  accountName=accountName
-                  accountUsername=accountUsername
-                  accountPassword=accountPassword
-                  userFields=userFields
+                  accountName=this.accountName
+                  accountUsername=this.accountUsername
+                  accountPassword=this.accountPassword
+                  userFields=this.userFields
                 }} />
 
-              {{#if userFields}}
+              {{#if this.userFields}}
                 <div class="user-fields">
-                  {{#each userFields as |f|}}
+                  {{#each this.userFields as |f|}}
                     <div class="input-group">
                       {{!-- adding the value-entered class here to
                       be able to detect if the user field has a value
@@ -121,27 +121,27 @@
           </div>
 
           <div class="modal-footer">
-            <DButton @class="btn-large btn-primary" @action={{action "createAccount"}} @disabled={{submitDisabled}} @label="create_account.title" @isLoading={{formSubmitted}} />
+            <DButton @class="btn-large btn-primary" @action={{action "createAccount"}} @disabled={{this.submitDisabled}} @label="create_account.title" @isLoading={{this.formSubmitted}} />
 
-            {{#unless hasAuthOptions}}
-              <DButton @class="btn-large" @id="login-link" @action={{route-action "showLogin"}} @disabled={{formSubmitted}} @label="log_in" />
+            {{#unless this.hasAuthOptions}}
+              <DButton @class="btn-large" @id="login-link" @action={{route-action "showLogin"}} @disabled={{this.formSubmitted}} @label="log_in" />
             {{/unless}}
 
             <div class="disclaimer">
-              {{html-safe disclaimerHtml}}
+              {{html-safe this.disclaimerHtml}}
             </div>
           </div>
 
           <PluginOutlet @name="create-account-after-modal-footer" @connectorTagName="div" />
 
         {{/if}}
-        {{#unless hasAuthOptions}}
+        {{#unless this.hasAuthOptions}}
           <div class="create-account-login-buttons">
             <LoginButtons @externalLogin={{action "externalLogin"}} />
           </div>
         {{/unless}}
 
-        {{#if skipConfirmation}}
+        {{#if this.skipConfirmation}}
           {{loading-spinner size="large"}}
         {{/if}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
index 30d55b36dd6..2735de2db54 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite-bulk.hbs
@@ -11,7 +11,7 @@
 
   <div class="modal-footer">
     {{#unless status.uploaded}}
-      <DButton @icon={{if isEmail "envelope" "link"}} @translatedLabel={{if status.uploading (i18n "user.invited.bulk_invite.progress" progress=status.uploadProgress) (i18n "user.invited.bulk_invite.text")}} @class="btn-primary" @action={{status.startUpload}} @disabled={{status.submitDisabled}} />
+      <DButton @icon={{if this.isEmail "envelope" "link"}} @translatedLabel={{if status.uploading (i18n "user.invited.bulk_invite.progress" progress=status.uploadProgress) (i18n "user.invited.bulk_invite.text")}} @class="btn-primary" @action={{status.startUpload}} @disabled={{status.submitDisabled}} />
     {{/unless}}
 
     <DButton @label="close" @class="btn-primary" @action={{route-action "closeModal"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
index 006c70a493b..8f645daa1a3 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/create-invite.hbs
@@ -1,26 +1,26 @@
-{{#if flashText}}
-  <div id="modal-alert" role="alert" class="alert alert-{{flashClass}}">
-    {{#if flashLink}}
+{{#if this.flashText}}
+  <div id="modal-alert" role="alert" class="alert alert-{{this.flashClass}}">
+    {{#if this.flashLink}}
       <div class="input-group invite-link">
-        <label for="invite-link">{{html-safe flashText}} {{i18n "user.invited.invite.instructions"}}</label>
+        <label for="invite-link">{{html-safe this.flashText}} {{i18n "user.invited.invite.instructions"}}</label>
         <div class="link-share-container">
-          <Input @name="invite-link" class="invite-link" @value={{invite.link}} @readonly={{true}} />
+          <Input @name="invite-link" class="invite-link" @value={{this.invite.link}} @readonly={{true}} />
           <CopyButton @selector="input.invite-link" @copied={{action "copied"}} />
         </div>
       </div>
     {{else}}
-      {{html-safe flashText}}
+      {{html-safe this.flashText}}
     {{/if}}
   </div>
 {{/if}}
 
-<DModalBody @title={{if editing "user.invited.invite.edit_title" "user.invited.invite.new_title"}}>
+<DModalBody @title={{if this.editing "user.invited.invite.edit_title" "user.invited.invite.new_title"}}>
   <form>
-    {{#if editing}}
+    {{#if this.editing}}
       <div class="input-group invite-link">
         <label for="invite-link">{{i18n "user.invited.invite.instructions"}}</label>
         <div class="link-share-container">
-          <Input @name="invite-link" class="invite-link" @value={{invite.link}} @readonly={{true}} />
+          <Input @name="invite-link" class="invite-link" @value={{this.invite.link}} @readonly={{true}} />
           <CopyButton @selector="input.invite-link" @copied={{action "copied"}} />
         </div>
       </div>
@@ -29,64 +29,64 @@
     <div class="input-group input-email">
       <label for="invite-email">
         {{d-icon "envelope"}}
-        {{#if isEmail}}
+        {{#if this.isEmail}}
           {{i18n "user.invited.invite.restrict_email"}}
-        {{else if isDomain}}
+        {{else if this.isDomain}}
           {{i18n "user.invited.invite.restrict_domain"}}
         {{else}}
           {{i18n "user.invited.invite.restrict"}}
         {{/if}}
       </label>
       <div class="invite-email-container">
-        <Input @id="invite-email" @value={{buffered.emailOrDomain}} @placeholderKey="user.invited.invite.email_or_domain_placeholder" />
-        {{#if capabilities.hasContactPicker}}
+        <Input @id="invite-email" @value={{this.buffered.emailOrDomain}} @placeholderKey="user.invited.invite.email_or_domain_placeholder" />
+        {{#if this.capabilities.hasContactPicker}}
           <DButton @icon="address-book" @action={{action "searchContact"}} @class="btn-primary open-contact-picker" />
         {{/if}}
       </div>
     </div>
 
-    {{#if isLink}}
+    {{#if this.isLink}}
       <div class="input-group invite-max-redemptions">
         <label for="invite-max-redemptions">{{d-icon "users"}}{{i18n "user.invited.invite.max_redemptions_allowed"}}</label>
-        <Input @id="invite-max-redemptions" @type="number" @value={{buffered.max_redemptions_allowed}} @min="1" @max={{maxRedemptionsAllowedLimit}} />
+        <Input @id="invite-max-redemptions" @type="number" @value={{this.buffered.max_redemptions_allowed}} @min="1" @max={{this.maxRedemptionsAllowedLimit}} />
       </div>
     {{/if}}
 
-    {{#if isEmail}}
+    {{#if this.isEmail}}
       <div class="input-group invite-custom-message">
         <label for="invite-message">{{i18n "user.invited.invite.custom_message"}}</label>
-        <Textarea @id="invite-message" @value={{buffered.custom_message}} />
+        <Textarea @id="invite-message" @value={{this.buffered.custom_message}} />
       </div>
     {{/if}}
 
-    {{#if currentUser.staff}}
+    {{#if this.currentUser.staff}}
       <div class="input-group invite-to-topic">
         <label for="invite-topic">{{d-icon "hand-point-right"}}{{i18n "user.invited.invite.invite_to_topic"}}</label>
-        <TopicChooser @value={{buffered.topicId}} @content={{topics}} @onChange={{action "onChangeTopic"}} @options={{hash
+        <TopicChooser @value={{this.buffered.topicId}} @content={{this.topics}} @onChange={{action "onChangeTopic"}} @options={{hash
             additionalFilters="status:public"
           }} />
       </div>
-    {{else if buffered.topicTitle}}
+    {{else if this.buffered.topicTitle}}
       <div class="input-group invite-to-topic">
         <label for="invite-topic">{{d-icon "hand-point-right"}}{{i18n "user.invited.invite.invite_to_topic"}}</label>
-        <Input @name="invite-topic" class="invite-topic" @value={{buffered.topicTitle}} @readonly={{true}} />
+        <Input @name="invite-topic" class="invite-topic" @value={{this.buffered.topicTitle}} @readonly={{true}} />
       </div>
     {{/if}}
 
-    {{#if canInviteToGroup}}
+    {{#if this.canInviteToGroup}}
       <div class="input-group invite-to-groups">
         <label>{{d-icon "users"}}{{i18n "user.invited.invite.add_to_groups"}}</label>
-        <GroupChooser @content={{allGroups}} @value={{buffered.groupIds}} @labelProperty="name" @onChange={{action (mut buffered.groupIds)}} />
+        <GroupChooser @content={{this.allGroups}} @value={{this.buffered.groupIds}} @labelProperty="name" @onChange={{action (mut this.buffered.groupIds)}} />
       </div>
     {{/if}}
 
-    {{#if currentUser.staff}}
+    {{#if this.currentUser.staff}}
       <div class="input-group invite-expires-at">
-        <FutureDateInput @displayLabelIcon="far-clock" @displayLabel={{i18n "user.invited.invite.expires_at"}} @customShortcuts={{timeShortcuts}} @clearable={{true}} @input={{buffered.expires_at}} @onChangeInput={{action (mut buffered.expires_at)}} />
+        <FutureDateInput @displayLabelIcon="far-clock" @displayLabel={{i18n "user.invited.invite.expires_at"}} @customShortcuts={{this.timeShortcuts}} @clearable={{true}} @input={{this.buffered.expires_at}} @onChangeInput={{action (mut this.buffered.expires_at)}} />
       </div>
     {{else}}
       <div class="input-group input-expires-at">
-        <label>{{d-icon "far-clock"}}{{expiresAtLabel}}</label>
+        <label>{{d-icon "far-clock"}}{{this.expiresAtLabel}}</label>
       </div>
     {{/if}}
   </form>
@@ -95,5 +95,5 @@
 <div class="modal-footer">
   <DButton @icon="link" @label="user.invited.invite.save_invite" @class="btn-primary save-invite" @action={{action "saveInvite"}} />
 
-  <DButton @icon="envelope" @label={{if invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email"}} @class="btn-primary send-invite" @action={{action "saveInvite" true}} @title={{unless isEmail "user.invited.invite.send_invite_email_instructions"}} @disabled={{not isEmail}} />
+  <DButton @icon="envelope" @label={{if this.invite.emailed "user.invited.reinvite" "user.invited.invite.send_invite_email"}} @class="btn-primary send-invite" @action={{action "saveInvite" true}} @title={{unless this.isEmail "user.invited.invite.send_invite_email_instructions"}} @disabled={{not this.isEmail}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
index 65328df6640..67996659c69 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/delete-topic-confirm.hbs
@@ -1,8 +1,8 @@
 <DModalBody>
-  <p>{{i18n "post.controls.delete_topic_confirm_modal" count=siteSettings.min_topic_views_for_delete_confirm}}</p>
+  <p>{{i18n "post.controls.delete_topic_confirm_modal" count=this.siteSettings.min_topic_views_for_delete_confirm}}</p>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "deleteTopic"}} @disabled={{deletingTopic}} @translatedLabel={{buttonTitle}} @class="btn-danger" />
+  <DButton @action={{action "deleteTopic"}} @disabled={{this.deletingTopic}} @translatedLabel={{this.buttonTitle}} @class="btn-danger" />
   <DButton @action={{route-action "closeModal"}} @label="post.controls.delete_topic_confirm_modal_no" @class="btn-primary" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs b/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
index a8bdc27904a..f9cb1d08041 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/discard-draft.hbs
@@ -6,7 +6,7 @@
 
 <div class="modal-footer">
   <DButton @icon="far-trash-alt" @label="post.cancel_composer.discard" @class="btn-danger discard-draft" @action={{action "destroyDraft"}} />
-  {{#if model.canSaveDraft}}
+  {{#if this.model.canSaveDraft}}
     <DButton @label="post.cancel_composer.save_draft" @class="save-draft" @action={{action "saveDraftAndClose"}} />
   {{/if}}
   <DButton @label="post.cancel_composer.keep_editing" @class="keep-editing" @action={{action "dismissModal"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs
index e49cf22bb08..2e01e98bf42 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/dismiss-notification-confirmation.hbs
@@ -1,5 +1,5 @@
 <DModalBody @headerClass="hidden" @class="dismiss-notification-confirmation">
-  {{i18n "notifications.dismiss_confirmation.body" count=count}}
+  {{i18n "notifications.dismiss_confirmation.body" count=this.count}}
 </DModalBody>
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs b/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
index b99f6e200cc..00be1f3f0d2 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/dismiss-read.hbs
@@ -1,9 +1,9 @@
 <DModalBody>
   <p>
-    <PreferenceCheckbox @labelKey="topics.bulk.also_dismiss_topics" @checked={{dismissTopics}} />
+    <PreferenceCheckbox @labelKey="topics.bulk.also_dismiss_topics" @checked={{this.dismissTopics}} />
   </p>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @action={{route-action "dismissReadTopics" dismissTopics}} @icon="check" @id="dismiss-read-confirm" @label="topics.bulk.dismiss" />
+  <DButton @class="btn-primary" @action={{route-action "dismissReadTopics" this.dismissTopics}} @icon="check" @id="dismiss-read-confirm" @label="topics.bulk.dismiss" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
index c3b0001cec2..751ba179041 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/do-not-disturb.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="do_not_disturb.title">
-  <TapTileGrid @activeTile={{duration}} as |grid|>
+  <TapTileGrid @activeTile={{this.duration}} as |grid|>
     <TapTile @class="do-not-disturb-tile" @tileId="30" @activeTile={{grid.activeTile}} @onChange={{action "setDuration"}}>
       {{i18n "do_not_disturb.options.half_hour"}}
     </TapTile>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/download-calendar.hbs b/app/assets/javascripts/discourse/app/templates/modal/download-calendar.hbs
index 5fc3df141a8..154e799edde 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/download-calendar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/download-calendar.hbs
@@ -3,13 +3,13 @@
     <div class="control-group">
       <div class="ics">
         <label class="radio" for="ics">
-          <RadioButton @name="select-calendar" @id="ics" @value="ics" @selection={{selectedCalendar}} @onChange={{action (mut selectedCalendar)}} />
+          <RadioButton @name="select-calendar" @id="ics" @value="ics" @selection={{this.selectedCalendar}} @onChange={{action (mut this.selectedCalendar)}} />
           {{i18n "download_calendar.save_ics"}}
         </label>
       </div>
       <div class="google">
         <label class="radio" for="google">
-          <RadioButton @name="select-calendar" @id="google" @value="google" @selection={{selectedCalendar}} @onChange={{action (mut selectedCalendar)}} />
+          <RadioButton @name="select-calendar" @id="google" @value="google" @selection={{this.selectedCalendar}} @onChange={{action (mut this.selectedCalendar)}} />
           {{i18n "download_calendar.save_google"}}
         </label>
       </div>
@@ -17,7 +17,7 @@
 
     <div class="control-group remember">
       <label>
-        <Input @type="checkbox" @checked={{remember}} /> <span>{{i18n "download_calendar.remember"}}</span>
+        <Input @type="checkbox" @checked={{this.remember}} /> <span>{{i18n "download_calendar.remember"}}</span>
       </label>
       <span>{{i18n "download_calendar.remember_explanation"}}</span>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
index 2f7131e338c..82f72212488 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-slow-mode.hbs
@@ -5,33 +5,33 @@
 
   <div class="control-group">
     <label class="slow-mode-label">{{i18n "topic.slow_mode_update.select"}}</label>
-    <ComboBox @class="slow-mode-type" @content={{slowModes}} @value={{selectedSlowMode}} @onChange={{action "setSlowModeDuration"}} />
+    <ComboBox @class="slow-mode-type" @content={{this.slowModes}} @value={{this.selectedSlowMode}} @onChange={{action "setSlowModeDuration"}} />
   </div>
 
-  {{#if showCustomSelect}}
+  {{#if this.showCustomSelect}}
     <div class="control-group">
       <label class="slow-mode-label">{{i18n "topic.slow_mode_update.hours"}}</label>
-      <Input @value={{hours}} @type="number" class="input-small" />
+      <Input @value={{this.hours}} @type="number" class="input-small" />
 
       <label class="slow-mode-label">{{i18n "topic.slow_mode_update.minutes"}}</label>
-      <Input @value={{minutes}} @type="number" class="input-small" />
+      <Input @value={{this.minutes}} @type="number" class="input-small" />
 
       <label class="slow-mode-label">{{i18n "topic.slow_mode_update.seconds"}}</label>
-      <Input @value={{seconds}} @type="number" class="input-small" />
+      <Input @value={{this.seconds}} @type="number" class="input-small" />
     </div>
   {{/if}}
 
   <div class="control-group">
-    <FutureDateInput @class="enabled-until" @label="topic.slow_mode_update.enabled_until" @labelClasses="slow-mode-label" @customShortcuts={{timeShortcuts}} @clearable={{true}} @input={{model.slow_mode_enabled_until}} @onChangeInput={{action (mut model.slow_mode_enabled_until)}} />
+    <FutureDateInput @class="enabled-until" @label="topic.slow_mode_update.enabled_until" @labelClasses="slow-mode-label" @customShortcuts={{this.timeShortcuts}} @clearable={{true}} @input={{this.model.slow_mode_enabled_until}} @onChangeInput={{action (mut this.model.slow_mode_enabled_until)}} />
   </div>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @disabled={{submitDisabled}} @icon="hourglass-start" @label={{saveButtonLabel}} @action={{action "enableSlowMode"}} />
+  <DButton @class="btn-primary" @disabled={{this.submitDisabled}} @icon="hourglass-start" @label={{this.saveButtonLabel}} @action={{action "enableSlowMode"}} />
 
-  <ConditionalLoadingSpinner @size="small" @condition={{loading}} />
+  <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
 
-  {{#if model.slow_mode_seconds}}
-    <DButton @class="btn-danger" @action={{action "disableSlowMode"}} @disabled={{submitDisabled}} @label="topic.slow_mode_update.remove" />
+  {{#if this.model.slow_mode_seconds}}
+    <DButton @class="btn-danger" @action={{action "disableSlowMode"}} @disabled={{this.submitDisabled}} @label="topic.slow_mode_update.remove" />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
index 9ccf87d47da..ed117a4846d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-topic-timer.hbs
@@ -1,12 +1,12 @@
 <DModalBody @title="topic.topic_status_update.title" @autoFocus="false" @id="topic-timer-modal">
-  <EditTopicTimerForm @topic={{model}} @topicTimer={{topicTimer}} @timerTypes={{publicTimerTypes}} @onChangeStatusType={{action "onChangeStatusType"}} @onChangeInput={{action "onChangeInput"}} />
+  <EditTopicTimerForm @topic={{this.model}} @topicTimer={{this.topicTimer}} @timerTypes={{this.publicTimerTypes}} @onChangeStatusType={{action "onChangeStatusType"}} @onChangeInput={{action "onChangeInput"}} />
 
   <div class="modal-footer control-group edit-topic-timer-buttons">
-    <DButton @class="btn-primary" @disabled={{saveDisabled}} @label="topic.topic_status_update.save" @action={{action "saveTimer"}} />
+    <DButton @class="btn-primary" @disabled={{this.saveDisabled}} @label="topic.topic_status_update.save" @action={{action "saveTimer"}} />
 
-    <ConditionalLoadingSpinner @size="small" @condition={{loading}} />
+    <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
 
-    {{#if topicTimer.execute_at}}
+    {{#if this.topicTimer.execute_at}}
       <DButton @class="pull-right btn-danger" @action={{action "removeTimer"}} @label="topic.topic_status_update.remove" />
     {{/if}}
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/edit-user-directory-columns.hbs b/app/assets/javascripts/discourse/app/templates/modal/edit-user-directory-columns.hbs
index 74e6f0e00cb..d926e8d6cfb 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/edit-user-directory-columns.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/edit-user-directory-columns.hbs
@@ -1,15 +1,15 @@
 <DModalBody @title="directory.edit_columns.title">
-  {{#if loading}}
+  {{#if this.loading}}
     {{loading-spinner size="large"}}
   {{else}}
     <div class="edit-directory-columns-container">
-      {{#each columns as |column|}}
+      {{#each this.columns as |column|}}
         <div class="edit-directory-column">
           <div class="left-content">
             <label class="column-name">
               <Input @type="checkbox" @checked={{column.enabled}} />
               {{#if (directory-column-is-automatic column=column)}}
-                {{directory-table-header-title field=column.name labelKey=labelKey icon=column.icon}}
+                {{directory-table-header-title field=column.name labelKey=this.labelKey icon=column.icon}}
               {{else if (directory-column-is-user-field column=column)}}
                 {{directory-table-header-title field=column.user_field.name translated=true}}
               {{else}}
diff --git a/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs
index 85c6ec69f37..c8033777df6 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/explain-reviewable.hbs
@@ -1,12 +1,12 @@
 <DModalBody @class="explain-reviewable">
-  <ConditionalLoadingSpinner @condition={{loading}}>
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
     <table>
       <tbody>
         <tr>
           <th>{{i18n "review.explain.formula"}}</th>
           <th>{{i18n "review.explain.subtotal"}}</th>
         </tr>
-        {{#each reviewableExplanation.scores as |s|}}
+        {{#each this.reviewableExplanation.scores as |s|}}
           <tr>
             <td>
               <ScoreValue @value="1.0" @tagName="" />
@@ -20,7 +20,7 @@
         {{/each}}
         <tr class="total">
           <td>{{i18n "review.explain.total"}}</td>
-          <td class="sum">{{float reviewableExplanation.total_score}}</td>
+          <td class="sum">{{float this.reviewableExplanation.total_score}}</td>
         </tr>
       </tbody>
     </table>
@@ -30,13 +30,13 @@
         <tr>
           <td>{{i18n "review.explain.min_score_visibility"}}</td>
           <td class="sum">
-            {{float reviewableExplanation.min_score_visibility}}
+            {{float this.reviewableExplanation.min_score_visibility}}
           </td>
         </tr>
         <tr>
           <td>{{i18n "review.explain.score_to_hide"}}</td>
           <td class="sum">
-            {{float reviewableExplanation.hide_post_score}}
+            {{float this.reviewableExplanation.hide_post_score}}
           </td>
         </tr>
       </tbody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
index 47bae104427..2652b139c8b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic-on-profile.hbs
@@ -1,7 +1,7 @@
 <DModalBody @class="feature-topic-on-profile" @id="choosing-topic">
-  <ChooseTopic @currentTopicId={{model.featured_topic.id}} @selectedTopicId={{newFeaturedTopicId}} @additionalFilters="status:public" @label="user.feature_topic_on_profile.search_label" @topicChangedCallback={{action "newTopicSelected"}} @loadOnInit={{true}} />
+  <ChooseTopic @currentTopicId={{this.model.featured_topic.id}} @selectedTopicId={{this.newFeaturedTopicId}} @additionalFilters="status:public" @label="user.feature_topic_on_profile.search_label" @topicChangedCallback={{action "newTopicSelected"}} @loadOnInit={{true}} />
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "save"}} @class="btn-primary save-featured-topic-on-profile" @disabled={{noTopicSelected}} @label="user.feature_topic_on_profile.save" />
+  <DButton @action={{action "save"}} @class="btn-primary save-featured-topic-on-profile" @disabled={{this.noTopicSelected}} @label="user.feature_topic_on_profile.save" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
index eadb34ee9ff..ec5dbbbfd64 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/feature-topic.hbs
@@ -1,12 +1,12 @@
 <DModalBody @class="feature-topic">
-  {{#if model.pinned_at}}
+  {{#if this.model.pinned_at}}
     <div class="feature-section">
       <div class="desc">
-        {{#if model.pinned_globally}}
+        {{#if this.model.pinned_globally}}
           <p>
-            <ConditionalLoadingSpinner @size="small" @condition={{loading}}>
-              {{#if pinnedGloballyCount}}
-                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
+            <ConditionalLoadingSpinner @size="small" @condition={{this.loading}}>
+              {{#if this.pinnedGloballyCount}}
+                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=this.pinnedGloballyCount)}}
               {{else}}
                 {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
               {{/if}}
@@ -15,13 +15,13 @@
           <p>{{i18n "topic.feature_topic.global_pin_note"}}</p>
         {{else}}
           <p>
-            <ConditionalLoadingSpinner @size="small" @condition={{loading}}>
-              {{html-safe alreadyPinnedMessage}}
+            <ConditionalLoadingSpinner @size="small" @condition={{this.loading}}>
+              {{html-safe this.alreadyPinnedMessage}}
             </ConditionalLoadingSpinner>
           </p>
           <p>{{i18n "topic.feature_topic.pin_note"}}</p>
         {{/if}}
-        <p>{{html-safe unPinMessage}}</p>
+        <p>{{html-safe this.unPinMessage}}</p>
         <p><DButton @action={{action "unpin"}} @icon="thumbtack" @label="topic.feature.unpin" @class="btn-primary" /></p>
       </div>
     </div>
@@ -29,28 +29,28 @@
     <div class="feature-section">
       <div class="desc">
         <p>
-          <ConditionalLoadingSpinner @size="small" @condition={{loading}}>
-            {{html-safe alreadyPinnedMessage}}
+          <ConditionalLoadingSpinner @size="small" @condition={{this.loading}}>
+            {{html-safe this.alreadyPinnedMessage}}
           </ConditionalLoadingSpinner>
         </p>
         <p>
           {{i18n "topic.feature_topic.pin_note"}}
         </p>
-        {{#if site.isMobileDevice}}
+        {{#if this.site.isMobileDevice}}
           <p>
-            {{html-safe pinMessage}}
+            {{html-safe this.pinMessage}}
           </p>
           <p class="with-validation">
-            <FutureDateInput @class="pin-until" @clearable={{true}} @input={{model.pinnedInCategoryUntil}} @onChangeInput={{action (mut model.pinnedInCategoryUntil)}} />
-            <PopupInputTip @validation={{pinInCategoryValidation}} @shownAt={{pinInCategoryTipShownAt}} />
+            <FutureDateInput @class="pin-until" @clearable={{true}} @input={{this.model.pinnedInCategoryUntil}} @onChangeInput={{action (mut this.model.pinnedInCategoryUntil)}} />
+            <PopupInputTip @validation={{this.pinInCategoryValidation}} @shownAt={{this.pinInCategoryTipShownAt}} />
           </p>
         {{else}}
           <p class="with-validation">
-            {{html-safe pinMessage}}
+            {{html-safe this.pinMessage}}
             <span>
               {{d-icon "far-clock"}}
-              <FutureDateInput @class="pin-until" @clearable={{true}} @input={{model.pinnedInCategoryUntil}} @onChangeInput={{action (mut model.pinnedInCategoryUntil)}} />
-              <PopupInputTip @validation={{pinInCategoryValidation}} @shownAt={{pinInCategoryTipShownAt}} />
+              <FutureDateInput @class="pin-until" @clearable={{true}} @input={{this.model.pinnedInCategoryUntil}} @onChangeInput={{action (mut this.model.pinnedInCategoryUntil)}} />
+              <PopupInputTip @validation={{this.pinInCategoryValidation}} @shownAt={{this.pinInCategoryTipShownAt}} />
             </span>
           </p>
         {{/if}}
@@ -59,13 +59,13 @@
         </p>
       </div>
     </div>
-    {{#if canPinGlobally}}
+    {{#if this.canPinGlobally}}
       <div class="feature-section">
         <div class="desc">
           <p>
-            <ConditionalLoadingSpinner @size="small" @condition={{loading}}>
-              {{#if pinnedGloballyCount}}
-                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount)}}
+            <ConditionalLoadingSpinner @size="small" @condition={{this.loading}}>
+              {{#if this.pinnedGloballyCount}}
+                {{html-safe (i18n "topic.feature_topic.already_pinned_globally" count=this.pinnedGloballyCount)}}
               {{else}}
                 {{html-safe (i18n "topic.feature_topic.not_pinned_globally")}}
               {{/if}}
@@ -74,21 +74,21 @@
           <p>
             {{i18n "topic.feature_topic.global_pin_note"}}
           </p>
-          {{#if site.isMobileDevice}}
+          {{#if this.site.isMobileDevice}}
             <p>
               {{i18n "topic.feature_topic.pin_globally"}}
             </p>
             <p class="with-validation">
-              <FutureDateInput @class="pin-until" @clearable={{true}} @input={{model.pinnedGloballyUntil}} @onChangeInput={{action (mut model.pinnedGloballyUntil)}} />
-              <PopupInputTip @validation={{pinGloballyValidation}} @shownAt={{pinGloballyTipShownAt}} />
+              <FutureDateInput @class="pin-until" @clearable={{true}} @input={{this.model.pinnedGloballyUntil}} @onChangeInput={{action (mut this.model.pinnedGloballyUntil)}} />
+              <PopupInputTip @validation={{this.pinGloballyValidation}} @shownAt={{this.pinGloballyTipShownAt}} />
             </p>
           {{else}}
             <p class="with-validation">
               {{i18n "topic.feature_topic.pin_globally"}}
               <span>
                 {{d-icon "far-clock"}}
-                <FutureDateInput @class="pin-until" @clearable={{true}} @input={{model.pinnedGloballyUntil}} @onChangeInput={{action (mut model.pinnedGloballyUntil)}} />
-                <PopupInputTip @validation={{pinGloballyValidation}} @shownAt={{pinGloballyTipShownAt}} />
+                <FutureDateInput @class="pin-until" @clearable={{true}} @input={{this.model.pinnedGloballyUntil}} @onChangeInput={{action (mut this.model.pinnedGloballyUntil)}} />
+                <PopupInputTip @validation={{this.pinGloballyValidation}} @shownAt={{this.pinGloballyTipShownAt}} />
               </span>
             </p>
           {{/if}}
@@ -99,12 +99,12 @@
       </div>
     {{/if}}
   {{/if}}
-  {{#if currentUser.staff}}
+  {{#if this.currentUser.staff}}
     <div class="feature-section">
       <div class="desc">
         <p>
-          <ConditionalLoadingSpinner @size="small" @condition={{loading}}>
-            {{#if bannerCount}}
+          <ConditionalLoadingSpinner @size="small" @condition={{this.loading}}>
+            {{#if this.bannerCount}}
               {{html-safe (i18n "topic.feature_topic.banner_exists")}}
             {{else}}
               {{html-safe (i18n "topic.feature_topic.no_banner_exists")}}
@@ -115,14 +115,14 @@
           {{i18n "topic.feature_topic.banner_note"}}
         </p>
         <p>
-          {{#if model.isBanner}}
+          {{#if this.model.isBanner}}
             {{i18n "topic.feature_topic.remove_banner"}}
           {{else}}
             {{i18n "topic.feature_topic.make_banner"}}
           {{/if}}
         </p>
         <p>
-          {{#if model.isBanner}}
+          {{#if this.model.isBanner}}
             <DButton @action={{action "removeBanner"}} @icon="thumbtack" @label="topic.feature.remove_banner" @class="btn-primary" />
           {{else}}
             <DButton @action={{action "makeBanner"}} @icon="thumbtack" @label="topic.feature.make_banner" @class="btn-primary make-banner" />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
index f50159e0917..863c4828954 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/flag.hbs
@@ -1,27 +1,27 @@
-<DModalBody @class="flag-modal-body" @title={{title}} @submitOnEnter={{false}}>
+<DModalBody @class="flag-modal-body" @title={{this.title}} @submitOnEnter={{false}}>
   <form>
-    <FlagSelection @nameKey={{selected.name_key}} @flags={{flagsAvailable}} as |f|>
-      <FlagActionType @flag={{f}} @message={{message}} @isWarning={{isWarning}} @selectedFlag={{selected}} @username={{model.username}} @staffFlagsAvailable={{staffFlagsAvailable}} @changePostActionType={{action "changePostActionType"}} />
+    <FlagSelection @nameKey={{this.selected.name_key}} @flags={{this.flagsAvailable}} as |f|>
+      <FlagActionType @flag={{f}} @message={{this.message}} @isWarning={{this.isWarning}} @selectedFlag={{this.selected}} @username={{this.model.username}} @staffFlagsAvailable={{this.staffFlagsAvailable}} @changePostActionType={{action "changePostActionType"}} />
     </FlagSelection>
   </form>
 
-  <PluginOutlet @name="flag-modal-bottom" @connectorTagName="div" @args={{hash post=model}} />
+  <PluginOutlet @name="flag-modal-bottom" @connectorTagName="div" @args={{hash post=this.model}} />
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @action={{action "createFlag"}} @disabled={{submitDisabled}} @title="flagging.submit_tooltip" @icon={{submitIcon}} @label={{submitLabel}} />
+  <DButton @class="btn-primary" @action={{action "createFlag"}} @disabled={{this.submitDisabled}} @title="flagging.submit_tooltip" @icon={{this.submitIcon}} @label={{this.submitLabel}} />
 
-  {{#if canSendWarning}}
-    <DButton @class="btn-danger" @action={{action "createFlagAsWarning"}} @disabled={{submitDisabled}} @icon="exclamation-triangle" @label="flagging.official_warning" />
+  {{#if this.canSendWarning}}
+    <DButton @class="btn-danger" @action={{action "createFlagAsWarning"}} @disabled={{this.submitDisabled}} @icon="exclamation-triangle" @label="flagging.official_warning" />
   {{/if}}
 
-  {{#if canTakeAction}}
-    <ReviewableBundledAction @bundle={{flagActions}} @performAction={{action "takeAction"}} @reviewableUpdating={{submitDisabled}} />
+  {{#if this.canTakeAction}}
+    <ReviewableBundledAction @bundle={{this.flagActions}} @performAction={{action "takeAction"}} @reviewableUpdating={{this.submitDisabled}} />
 
-    <DButton @class="btn-danger" @action={{action "flagForReview"}} @disabled={{cantFlagForReview}} @icon="exclamation-triangle" @label="flagging.flag_for_review" />
+    <DButton @class="btn-danger" @action={{action "flagForReview"}} @disabled={{this.cantFlagForReview}} @icon="exclamation-triangle" @label="flagging.flag_for_review" />
   {{/if}}
 
-  {{#if showDeleteSpammer}}
-    <DButton @class="btn-danger" @action={{action "deleteSpammer"}} @disabled={{submitDisabled}} @icon="exclamation-triangle" @label="flagging.delete_spammer" />
+  {{#if this.showDeleteSpammer}}
+    <DButton @class="btn-danger" @action={{action "deleteSpammer"}} @disabled={{this.submitDisabled}} @icon="exclamation-triangle" @label="flagging.delete_spammer" />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs b/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs
index 9adbbaa7ff5..332bd57af6f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/forgot-password.hbs
@@ -1,25 +1,25 @@
 <form>
   <DModalBody @class="forgot-password-modal">
-    {{#if offerHelp}}
-      {{html-safe offerHelp}}
+    {{#if this.offerHelp}}
+      {{html-safe this.offerHelp}}
     {{else}}
-      {{#if siteSettings.hide_email_address_taken}}
+      {{#if this.siteSettings.hide_email_address_taken}}
         <label for="username-or-email">{{i18n "forgot_password.invite_no_username"}}</label>
-        <TextField @value={{accountEmailOrUsername}} @placeholderKey="email" @id="username-or-email" @autocorrect="off" @autocapitalize="off" />
+        <TextField @value={{this.accountEmailOrUsername}} @placeholderKey="email" @id="username-or-email" @autocorrect="off" @autocapitalize="off" />
       {{else}}
         <label for="username-or-email">{{i18n "forgot_password.invite"}}</label>
-        <TextField @value={{accountEmailOrUsername}} @placeholderKey="login.email_placeholder" @id="username-or-email" @autocorrect="off" @autocapitalize="off" />
+        <TextField @value={{this.accountEmailOrUsername}} @placeholderKey="login.email_placeholder" @id="username-or-email" @autocorrect="off" @autocapitalize="off" />
       {{/if}}
     {{/if}}
   </DModalBody>
   <div class="modal-footer">
-    {{#if offerHelp}}
+    {{#if this.offerHelp}}
       <DButton @class="btn-large btn-primary" @label="forgot_password.button_ok" @type="submit" @action={{action "ok"}} />
-      {{#unless helpSeen}}
+      {{#unless this.helpSeen}}
         <DButton @class="btn-large" @label="forgot_password.button_help" @icon="question-circle" @action={{action "help"}} />
       {{/unless}}
     {{else}}
-      <DButton @action={{action "resetPassword"}} @label="forgot_password.reset" @disabled={{submitDisabled}} @class="btn-primary forgot-password-reset" @type="submit" />
+      <DButton @action={{action "resetPassword"}} @label="forgot_password.reset" @disabled={{this.submitDisabled}} @class="btn-primary forgot-password-reset" @type="submit" />
     {{/if}}
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs
index 18c2a737f77..1926fe917ce 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-code.hbs
@@ -1,5 +1,4 @@
 <DModalBody>
-  <pre>
-    <code class={{codeClasses}}>{{code}}</code>
+  <pre>    <code class={{this.codeClasses}}>{{this.code}}</code>
   </pre>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs
index c16f985b994..2d1adaa88f7 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/fullscreen-table.hbs
@@ -1,3 +1,3 @@
 <DModalBody>
-  {{tableHtml}}
+  {{this.tableHtml}}
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
index d661c1fa10b..ef323be86bf 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/grant-badge.hbs
@@ -1,10 +1,10 @@
 <DModalBody @class="grant-badge">
-  <ConditionalLoadingSpinner @condition={{loading}}>
-    {{#if noGrantableBadges}}
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
+    {{#if this.noGrantableBadges}}
       <p>{{i18n "admin.badges.no_badges"}}</p>
     {{else}}
       <p>
-        <ComboBox @value={{selectedBadgeId}} @content={{grantableBadges}} @onChange={{action (mut selectedBadgeId)}} @options={{hash
+        <ComboBox @value={{this.selectedBadgeId}} @content={{this.grantableBadges}} @onChange={{action (mut this.selectedBadgeId)}} @options={{hash
             filterable=true
             none="badges.none"
           }} />
@@ -14,5 +14,5 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @disabled={{buttonDisabled}} @action={{action "grantBadge"}} @label="admin.badges.grant" />
+  <DButton @class="btn-primary" @disabled={{this.buttonDisabled}} @action={{action "grantBadge"}} @label="admin.badges.grant" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
index ef8d1fc1532..f9515885665 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/group-add-members.hbs
@@ -1,21 +1,21 @@
-<DModalBody @rawTitle={{rawTitle}}>
+<DModalBody @rawTitle={{this.rawTitle}}>
   <form class="form-vertical group-add-members">
     <p>{{i18n "groups.add_members.description"}}</p>
 
     <div class="input-group">
-      <EmailGroupUserChooser @value={{usernamesAndEmails}} @onChange={{action "setUsernamesAndEmails"}} @options={{hash
-          allowEmails=currentUser.can_invite_to_forum
-          filterPlaceholder=(if currentUser.can_invite_to_forum
+      <EmailGroupUserChooser @value={{this.usernamesAndEmails}} @onChange={{action "setUsernamesAndEmails"}} @options={{hash
+          allowEmails=this.currentUser.can_invite_to_forum
+          filterPlaceholder=(if this.currentUser.can_invite_to_forum
                              "groups.add_members.usernames_or_emails_placeholder"
                              "groups.add_members.usernames_placeholder"
                             )
         }} />
     </div>
 
-    {{#if model.can_admin_group}}
+    {{#if this.model.can_admin_group}}
       <div class="input-group">
         <label>
-          <Input @id="set-owner" @type="checkbox" @checked={{setOwner}} @disabled={{emails}} />
+          <Input @id="set-owner" @type="checkbox" @checked={{this.setOwner}} @disabled={{this.emails}} />
           {{i18n "groups.add_members.set_owner"}}
         </label>
       </div>
@@ -23,7 +23,7 @@
 
     <div class="input-group">
       <label>
-        <Input @type="checkbox" @checked={{notifyUsers}} @disabled={{and (not usernames) emails}} />
+        <Input @type="checkbox" @checked={{this.notifyUsers}} @disabled={{and (not this.usernames) this.emails}} />
         {{i18n "groups.add_members.notify_users"}}
       </label>
     </div>
@@ -31,5 +31,5 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "addMembers"}} @class="add btn-primary" @icon="plus" @disabled={{or loading (not usernamesAndEmails)}} @label="groups.add" />
+  <DButton @action={{action "addMembers"}} @class="add btn-primary" @icon="plus" @disabled={{or this.loading (not this.usernamesAndEmails)}} @label="groups.add" />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs b/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs
index a500578cd90..ed77b5ae68b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/group-default-notifications.hbs
@@ -1,5 +1,5 @@
 <DModalBody @title="groups.default_notifications.modal_title">
-  {{i18n "groups.default_notifications.modal_description" count=model.count}}
+  {{i18n "groups.default_notifications.modal_description" count=this.model.count}}
 </DModalBody>
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/history.hbs b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
index 4924977cf8d..38f30da9ddf 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/history.hbs
@@ -1,48 +1,48 @@
-<DModalBody @title={{modalTitleKey}} @maxHeight="70%">
+<DModalBody @title={{this.modalTitleKey}} @maxHeight="70%">
   <div id="revision">
     <div id="revision-details">
       {{d-icon "pencil-alt"}}
-      <LinkTo @route="user" @model={{model.username}}>
-        {{bound-avatar-template model.avatar_template "small"}} {{model.username}}
+      <LinkTo @route="user" @model={{this.model.username}}>
+        {{bound-avatar-template this.model.avatar_template "small"}} {{this.model.username}}
       </LinkTo>
-      <PluginOutlet @name="revision-user-details-after" @args={{hash model=model}} />
-      <span class="date">{{bound-date model.created_at}}</span>
-      {{#if model.edit_reason}}
-        &mdash; <span class="edit-reason">{{model.edit_reason}}</span>
+      <PluginOutlet @name="revision-user-details-after" @args={{hash model=this.model}} />
+      <span class="date">{{bound-date this.model.created_at}}</span>
+      {{#if this.model.edit_reason}}
+        &mdash; <span class="edit-reason">{{this.model.edit_reason}}</span>
       {{/if}}
-      {{#unless site.mobileView}}
-        {{#if model.user_changes}}
-          &mdash; {{bound-avatar-template model.user_changes.previous.avatar_template "small"}} {{model.user_changes.previous.username}}
-          &rarr; {{bound-avatar-template model.user_changes.current.avatar_template "small"}} {{model.user_changes.current.username}}
+      {{#unless this.site.mobileView}}
+        {{#if this.model.user_changes}}
+          &mdash; {{bound-avatar-template this.model.user_changes.previous.avatar_template "small"}} {{this.model.user_changes.previous.username}}
+          &rarr; {{bound-avatar-template this.model.user_changes.current.avatar_template "small"}} {{this.model.user_changes.current.username}}
         {{/if}}
-        {{#if model.wiki_changes}}
-          &mdash; <DisabledIcon @icon="far-edit" @disabled={{wikiDisabled}} />
+        {{#if this.model.wiki_changes}}
+          &mdash; <DisabledIcon @icon="far-edit" @disabled={{this.wikiDisabled}} />
         {{/if}}
-        {{#if model.post_type_changes}}
-          &mdash; <DisabledIcon @icon="shield-alt" @disabled={{postTypeDisabled}} />
+        {{#if this.model.post_type_changes}}
+          &mdash; <DisabledIcon @icon="shield-alt" @disabled={{this.postTypeDisabled}} />
         {{/if}}
-        {{#if model.category_id_changes}}
-          &mdash; {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+        {{#if this.model.category_id_changes}}
+          &mdash; {{html-safe this.previousCategory}} &rarr; {{html-safe this.currentCategory}}
         {{/if}}
       {{/unless}}
     </div>
-    {{#unless site.mobileView}}
+    {{#unless this.site.mobileView}}
       <div id="display-modes">
         <ul class="nav nav-pills">
           <li>
-            <a href class={{inlineClass}} {{action "displayInline"}} title={{i18n "post.revisions.displays.inline.title"}}>
+            <a href class={{this.inlineClass}} {{action "displayInline"}} title={{i18n "post.revisions.displays.inline.title"}}>
               {{d-icon "far-square"}}
               {{i18n "post.revisions.displays.inline.button"}}
             </a>
           </li>
           <li>
-            <a href class={{sideBySideClass}} {{action "displaySideBySide"}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
+            <a href class={{this.sideBySideClass}} {{action "displaySideBySide"}} title={{i18n "post.revisions.displays.side_by_side.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side.button"}}
             </a>
           </li>
           <li>
-            <a href class={{sideBySideMarkdownClass}} {{action "displaySideBySideMarkdown"}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
+            <a href class={{this.sideBySideMarkdownClass}} {{action "displaySideBySideMarkdown"}} title={{i18n "post.revisions.displays.side_by_side_markdown.title"}}>
               {{d-icon "columns"}}
               {{i18n "post.revisions.displays.side_by_side_markdown.button"}}
             </a>
@@ -51,92 +51,92 @@
       </div>
     {{/unless}}
   </div>
-  <div id="revisions" data-post-id={{model.post_id}} class={{hiddenClasses}}>
-    {{#if model.title_changes}}
+  <div id="revisions" data-post-id={{this.model.post_id}} class={{this.hiddenClasses}}>
+    {{#if this.model.title_changes}}
       <div class="row">
-        <h2>{{html-safe titleDiff}}</h2>
+        <h2>{{html-safe this.titleDiff}}</h2>
       </div>
     {{/if}}
-    {{#if site.mobileView}}
-      {{#if user_changes}}
+    {{#if this.site.mobileView}}
+      {{#if this.user_changes}}
         <div class="row">
-          {{bound-avatar-template model.user_changes.previous.avatar_template "small"}} {{model.user_changes.previous.username}}
-          &rarr; {{bound-avatar-template model.user_changes.current.avatar_template "small"}} {{model.user_changes.current.username}}
+          {{bound-avatar-template this.model.user_changes.previous.avatar_template "small"}} {{this.model.user_changes.previous.username}}
+          &rarr; {{bound-avatar-template this.model.user_changes.current.avatar_template "small"}} {{this.model.user_changes.current.username}}
         </div>
       {{/if}}
-      {{#if model.wiki_changes}}
+      {{#if this.model.wiki_changes}}
         <div class="row">
-          <DisabledIcon @icon="far-edit" @disabled={{wikiDisabled}} />
+          <DisabledIcon @icon="far-edit" @disabled={{this.wikiDisabled}} />
         </div>
       {{/if}}
-      {{#if model.post_type_changes}}
+      {{#if this.model.post_type_changes}}
         <div class="row">
-          <DisabledIcon @icon="shield-alt" @disabled={{postTypeDisabled}} />
+          <DisabledIcon @icon="shield-alt" @disabled={{this.postTypeDisabled}} />
         </div>
       {{/if}}
-      {{#if model.category_id_changes}}
+      {{#if this.model.category_id_changes}}
         <div class="row">
-          {{html-safe previousCategory}} &rarr; {{html-safe currentCategory}}
+          {{html-safe this.previousCategory}} &rarr; {{html-safe this.currentCategory}}
         </div>
       {{/if}}
     {{/if}}
-    {{#if model.tags_changes}}
+    {{#if this.model.tags_changes}}
       <div class="row">
         {{i18n "tagging.changed"}}
-        {{#each previousTagChanges as |t|}}
+        {{#each this.previousTagChanges as |t|}}
           {{discourse-tag t.name style=(if t.deleted "diff-del")}}
         {{/each}}
         &rarr;
         &nbsp;
-        {{#each currentTagChanges as |t|}}
+        {{#each this.currentTagChanges as |t|}}
           {{discourse-tag t.name style=(if t.inserted "diff-ins")}}
         {{/each}}
       </div>
     {{/if}}
-    {{#if model.featured_link_changes}}
+    {{#if this.model.featured_link_changes}}
       <div class="row">
-        {{model.featured_link_changes.previous}}
+        {{this.model.featured_link_changes.previous}}
         &rarr;
-        {{model.featured_link_changes.current}}
+        {{this.model.featured_link_changes.current}}
       </div>
     {{/if}}
 
-    <PluginOutlet @name="post-revisions" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+    <PluginOutlet @name="post-revisions" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
     <LinksRedirect @class="row">
-      {{html-safe bodyDiff}}
+      {{html-safe this.bodyDiff}}
     </LinksRedirect>
   </div>
 </DModalBody>
-{{#if topicController}}
+{{#if this.topicController}}
   <div class="modal-footer">
     <div id="revision-controls">
-      <DButton @class="btn-default" @action={{action "loadFirstVersion"}} @icon="fast-backward" @title="post.revisions.controls.first" @disabled={{loadFirstDisabled}} />
-      <DButton @class="btn-default" @action={{action "loadPreviousVersion"}} @icon="backward" @title="post.revisions.controls.previous" @disabled={{loadPreviousDisabled}} />
-      <div id="revision-numbers" class={{unless displayRevisions "invisible"}}>
-        <ConditionalLoadingSpinner @condition={{loading}} @size="small">
-          {{html-safe revisionsText}}
+      <DButton @class="btn-default" @action={{action "loadFirstVersion"}} @icon="fast-backward" @title="post.revisions.controls.first" @disabled={{this.loadFirstDisabled}} />
+      <DButton @class="btn-default" @action={{action "loadPreviousVersion"}} @icon="backward" @title="post.revisions.controls.previous" @disabled={{this.loadPreviousDisabled}} />
+      <div id="revision-numbers" class={{unless this.displayRevisions "invisible"}}>
+        <ConditionalLoadingSpinner @condition={{this.loading}} @size="small">
+          {{html-safe this.revisionsText}}
         </ConditionalLoadingSpinner>
       </div>
-      <DButton @class="btn-default" @action={{action "loadNextVersion"}} @icon="forward" @title="post.revisions.controls.next" @disabled={{loadNextDisabled}} />
-      <DButton @class="btn-default" @action={{action "loadLastVersion"}} @icon="fast-forward" @title="post.revisions.controls.last" @disabled={{loadLastDisabled}} />
+      <DButton @class="btn-default" @action={{action "loadNextVersion"}} @icon="forward" @title="post.revisions.controls.next" @disabled={{this.loadNextDisabled}} />
+      <DButton @class="btn-default" @action={{action "loadLastVersion"}} @icon="fast-forward" @title="post.revisions.controls.last" @disabled={{this.loadLastDisabled}} />
     </div>
 
     <div id="revision-footer-buttons">
-      {{#if displayEdit}}
-        <DButton @action={{action "editPost"}} @icon="pencil-alt" @class="btn-default" @label={{editButtonLabel}} />
+      {{#if this.displayEdit}}
+        <DButton @action={{action "editPost"}} @icon="pencil-alt" @class="btn-default" @label={{this.editButtonLabel}} />
       {{/if}}
 
-      {{#if displayRevert}}
-        <DButton @action={{action "revertToVersion"}} @icon="undo" @translatedLabel={{revertToRevisionText}} @class="btn-danger" @disabled={{loading}} />
+      {{#if this.displayRevert}}
+        <DButton @action={{action "revertToVersion"}} @icon="undo" @translatedLabel={{this.revertToRevisionText}} @class="btn-danger" @disabled={{this.loading}} />
       {{/if}}
 
-      {{#if displayHide}}
-        <DButton @action={{action "hideVersion"}} @icon="far-eye-slash" @label="post.revisions.controls.hide" @class="btn-danger" @disabled={{loading}} />
+      {{#if this.displayHide}}
+        <DButton @action={{action "hideVersion"}} @icon="far-eye-slash" @label="post.revisions.controls.hide" @class="btn-danger" @disabled={{this.loading}} />
       {{/if}}
 
-      {{#if displayShow}}
-        <DButton @action={{action "showVersion"}} @icon="far-eye" @label="post.revisions.controls.show" @class="btn-default" @disabled={{loading}} />
+      {{#if this.displayShow}}
+        <DButton @action={{action "showVersion"}} @icon="far-eye" @label="post.revisions.controls.show" @class="btn-default" @disabled={{this.loading}} />
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
index 453b1d35dc4..22f3a2c94d3 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
@@ -1,16 +1,16 @@
 <DModalBody @title="user.user_notifications.ignore_duration_title" @autoFocus="false">
   <div class="controls tracking-controls">
     <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n "user.user_notifications.ignore_duration_username"}}</label>
-    <EmailGroupUserChooser @value={{ignoredUsername}} @onChange={{action "updateIgnoredUsername"}} @options={{hash
+    <EmailGroupUserChooser @value={{this.ignoredUsername}} @onChange={{action "updateIgnoredUsername"}} @options={{hash
         excludeCurrentUser=true
         maximum=1
       }} />
   </div>
-  <FutureDateInput @label="user.user_notifications.ignore_duration_when" @input={{readonly ignoredUntil}} @customShortcuts={{timeShortcuts}} @includeDateTime={{false}} @onChangeInput={{action (mut ignoredUntil)}} />
+  <FutureDateInput @label="user.user_notifications.ignore_duration_when" @input={{readonly this.ignoredUntil}} @customShortcuts={{this.timeShortcuts}} @includeDateTime={{false}} @onChangeInput={{action (mut this.ignoredUntil)}} />
   <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @disabled={{saveDisabled}} @label="user.user_notifications.ignore_duration_save" @action={{action "ignore"}} />
-  <ConditionalLoadingSpinner @size="small" @condition={{loading}} />
+  <DButton @class="btn-primary" @disabled={{this.saveDisabled}} @label="user.user_notifications.ignore_duration_save" @action={{action "ignore"}} />
+  <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
index 8f461e9d786..356884cd52e 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
@@ -1,10 +1,10 @@
 <DModalBody @title="user.user_notifications.ignore_duration_title" @autoFocus="false">
-  <FutureDateInput @label="user.user_notifications.ignore_duration_when" @input={{ignoredUntil}} @customShortcuts={{timeShortcuts}} @includeDateTime={{false}} @onChangeInput={{action (mut ignoredUntil)}} />
+  <FutureDateInput @label="user.user_notifications.ignore_duration_when" @input={{this.ignoredUntil}} @customShortcuts={{this.timeShortcuts}} @includeDateTime={{false}} @onChangeInput={{action (mut this.ignoredUntil)}} />
   <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary ignore-duration-save" @disabled={{saveDisabled}} @label="user.user_notifications.ignore_duration_save" @action={{action "ignore"}} />
+  <DButton @class="btn-primary ignore-duration-save" @disabled={{this.saveDisabled}} @label="user.user_notifications.ignore_duration_save" @action={{action "ignore"}} />
 
-  <ConditionalLoadingSpinner @size="small" @condition={{loading}} />
+  <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
index bc6fb841c67..52250bd8252 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/insert-hyperlink.hbs
@@ -1,13 +1,13 @@
 <DModalBody @title="composer.link_dialog_title" @class="insert-link">
   <form id="insert-hyperlink-form" {{action "ok" on="submit"}}>
     <div class="inputs">
-      <TextField @value={{linkUrl}} @placeholderKey="composer.link_url_placeholder" @class="link-url" @key-up={{action "search"}} @autofocus="autofocus" />
-      {{#if searchLoading}}
+      <TextField @value={{this.linkUrl}} @placeholderKey="composer.link_url_placeholder" @class="link-url" @key-up={{action "search"}} @autofocus="autofocus" />
+      {{#if this.searchLoading}}
         {{loading-spinner}}
       {{/if}}
-      {{#if searchResults}}
+      {{#if this.searchResults}}
         <div class="internal-link-results">
-          {{#each searchResults as |result|}}
+          {{#each this.searchResults as |result|}}
             <a
               class="search-link"
               href={{result.url}}
@@ -29,7 +29,7 @@
       {{/if}}
     </div>
     <div class="inputs">
-      <TextField @value={{linkText}} @placeholderKey="composer.link_optional_text" @class="link-text" />
+      <TextField @value={{this.linkText}} @placeholderKey="composer.link_optional_text" @class="link-text" />
     </div>
   </form>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs b/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs
index 804c39bdd33..d033ed6af4c 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/jump-to-post.hbs
@@ -3,9 +3,9 @@
   <div class="jump-to-post-form">
     <div class="jump-to-post-control">
       <span class="index">#</span>
-      <Input @id="post-jump" @type="number" @value={{postNumber}} @insert-newline={{action "jump"}} @autofocus="true" />
+      <Input @id="post-jump" @type="number" @value={{this.postNumber}} @insert-newline={{action "jump"}} @autofocus="true" />
       <span class="input-hint-text post-number">
-        {{i18n "topic.progress.jump_prompt_of" count=filteredPostsCount}}
+        {{i18n "topic.progress.jump_prompt_of" count=this.filteredPostsCount}}
       </span>
     </div>
 
@@ -20,7 +20,7 @@
       <span class="input-hint-text post-date">
         {{i18n "topic.progress.jump_prompt_to_date"}}
       </span>
-      <DatePicker @id="post-date" @class="date-input" @value={{postDate}} @defaultDate="YYYY-MM-DD" />
+      <DatePicker @id="post-date" @class="date-input" @value={{this.postDate}} @defaultDate="YYYY-MM-DD" />
     </div>
   </div>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
index ee0d40f57ca..2d27a9567a0 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/keyboard-shortcuts-help.hbs
@@ -1,5 +1,5 @@
 <DModalBody @id="keyboard-shortcuts-help">
-  {{#each-in shortcuts as |category shortcutCategory|}}
+  {{#each-in this.shortcuts as |category shortcutCategory|}}
     <section class="shortcut-category span-{{shortcutCategory.count}} shortcut-category-{{category}}">
       <h4>{{i18n (concat "keyboard_shortcuts_help." category ".title")}}</h4>
       <ul>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/login.hbs b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
index a7e055d3a69..da7fc53105b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/login.hbs
@@ -1,59 +1,59 @@
-<LoginModal @loginName={{loginName}} @loginPassword={{loginPassword}} @secondFactorToken={{secondFactorToken}} @action={{action "login"}}>
+<LoginModal @loginName={{this.loginName}} @loginPassword={{this.loginPassword}} @secondFactorToken={{this.secondFactorToken}} @action={{action "login"}}>
   <PluginOutlet @name="login-before-modal-body" @connectorTagName="div" />
-  <DModalBody @class={{modalBodyClasses}}>
+  <DModalBody @class={{this.modalBodyClasses}}>
 
-    {{#if canLoginLocal}}
+    {{#if this.canLoginLocal}}
       <div class="login-left-side">
         <div class="login-welcome-header">
-          <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+          <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{this.wavingHandURL}} alt="" class="waving-hand">
           <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
         </div>
         <form id="login-form" method="post">
-          <div id="credentials" class={{credentialsClass}}>
+          <div id="credentials" class={{this.credentialsClass}}>
             <div class="input-group">
-              <Input @value={{loginName}} @type="email" @id="login-account-name" class={{value-entered loginName}} @autocomplete="username" @autocorrect="off" @autocapitalize="off" @disabled={{showSecondFactor}} @autofocus="autofocus" @tabindex="1" />
+              <Input @value={{this.loginName}} @type="email" @id="login-account-name" class={{value-entered this.loginName}} @autocomplete="username" @autocorrect="off" @autocapitalize="off" @disabled={{this.showSecondFactor}} @autofocus="autofocus" @tabindex="1" />
               <label class="alt-placeholder" for="login-account-name">{{i18n "login.email_placeholder"}}</label>
-              {{#if showLoginWithEmailLink}}
-                <a href class={{if loginName "" "no-login-filled"}} tabindex="3"  id="email-login-link" {{action (unless processingEmailLink "emailLogin")}}>
+              {{#if this.showLoginWithEmailLink}}
+                <a href class={{if this.loginName "" "no-login-filled"}} tabindex="3" id="email-login-link" {{action (unless this.processingEmailLink "emailLogin")}}>
                   {{i18n "email_login.login_link"}}
                 </a>
               {{/if}}
             </div>
             <div class="input-group">
-              <Input @value={{loginPassword}} @type="password" class={{value-entered loginPassword}} @id="login-account-password" @autocomplete="current-password" @maxlength="200" @capsLockOn={{capsLockOn}} @disabled={{disableLoginFields}} @tabindex="1" />
+              <Input @value={{this.loginPassword}} @type="password" class={{value-entered this.loginPassword}} @id="login-account-password" @autocomplete="current-password" @maxlength="200" @capsLockOn={{this.capsLockOn}} @disabled={{this.disableLoginFields}} @tabindex="1" />
               <label class="alt-placeholder" for="login-account-password">{{i18n "login.password"}}</label>
               <a href id="forgot-password-link" tabindex="3" {{action "forgotPassword"}}>{{i18n "forgot_password.action"}}</a>
-              <div class="caps-lock-warning {{unless capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
+              <div class="caps-lock-warning {{unless this.capsLockOn "hidden"}}">{{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}</div>
             </div>
           </div>
-          <SecondFactorForm @secondFactorMethod={{secondFactorMethod}} @secondFactorToken={{secondFactorToken}} @class={{secondFactorClass}} @backupEnabled={{backupEnabled}} @isLogin={{true}}>
-            {{#if showSecurityKey}}
-              <SecurityKeyForm @allowedCredentialIds={{securityKeyAllowedCredentialIds}} @challenge={{securityKeyChallenge}} @showSecurityKey={{showSecurityKey}} @showSecondFactor={{showSecondFactor}} @secondFactorMethod={{secondFactorMethod}} @otherMethodAllowed={{otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
+          <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @class={{this.secondFactorClass}} @backupEnabled={{this.backupEnabled}} @isLogin={{true}}>
+            {{#if this.showSecurityKey}}
+              <SecurityKeyForm @allowedCredentialIds={{this.securityKeyAllowedCredentialIds}} @challenge={{this.securityKeyChallenge}} @showSecurityKey={{this.showSecurityKey}} @showSecondFactor={{this.showSecondFactor}} @secondFactorMethod={{this.secondFactorMethod}} @otherMethodAllowed={{this.otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
               </SecurityKeyForm>
             {{else}}
-              <SecondFactorInput @value={{secondFactorToken}} @inputId="login-second-factor" @secondFactorMethod={{secondFactorMethod}} @backupEnabled={{backupEnabled}} />
+              <SecondFactorInput @value={{this.secondFactorToken}} @inputId="login-second-factor" @secondFactorMethod={{this.secondFactorMethod}} @backupEnabled={{this.backupEnabled}} />
             {{/if}}
           </SecondFactorForm>
         </form>
         <div class="modal-footer">
-          {{#if canLoginLocal}}
-            {{#unless showSecurityKey }}
-              <DButton @action={{action "login"}} @id="login-button" @form="login-form" @icon="unlock" @label={{loginButtonLabel}} @disabled={{loginDisabled}} @class="btn btn-large btn-primary" @tabindex="2" />
+          {{#if this.canLoginLocal}}
+            {{#unless this.showSecurityKey }}
+              <DButton @action={{action "login"}} @id="login-button" @form="login-form" @icon="unlock" @label={{this.loginButtonLabel}} @disabled={{this.loginDisabled}} @class="btn btn-large btn-primary" @tabindex="2" />
             {{/unless}}
 
-            {{#if showSignupLink}}
+            {{#if this.showSignupLink}}
               <DButton @class="btn-large" @id="new-account-link" @action={{action "createAccount"}} @label="create_account.title" @tabindex="3" />
             {{/if}}
           {{/if}}
-          <ConditionalLoadingSpinner @condition={{showSpinner}} @size="small" />
+          <ConditionalLoadingSpinner @condition={{this.showSpinner}} @size="small" />
         </div>
       </div>
     {{/if}}
-    {{#if showLoginButtons}}
-      {{#if noLoginLocal}}
+    {{#if this.showLoginButtons}}
+      {{#if this.noLoginLocal}}
         <div class="login-left-side">
           <div class="login-welcome-header">
-            <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{wavingHandURL}} alt="" class="waving-hand">
+            <h1 class="login-title">{{i18n "login.header_title"}}</h1> <img src={{this.wavingHandURL}} alt="" class="waving-hand">
             <p class="login-subheader">{{i18n "login.subheader_title"}}</p>
           </div>
         </div>
@@ -67,5 +67,5 @@
 
   <PluginOutlet @name="login-after-modal-footer" @connectorTagName="div" />
 
-  <div class={{alertClass}} id="login-alert">{{alert}}</div>
+  <div class={{this.alertClass}} id="login-alert">{{this.alert}}</div>
 </LoginModal>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
index ee8f3f79a40..97b026becf6 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/move-to-topic.hbs
@@ -1,102 +1,102 @@
 <DModalBody @id="choosing-topic">
 
-  {{#if model.isPrivateMessage}}
+  {{#if this.model.isPrivateMessage}}
     <div class="radios">
-      {{#if canSplitToPM}}
+      {{#if this.canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          <RadioButton @id="move-to-new-message" @name="move-to-entity" @value="new_message" @selection={{selection}} />
+          <RadioButton @id="move-to-new-message" @name="move-to-entity" @value="new_message" @selection={{this.selection}} />
           <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-message">
-        <RadioButton @id="move-to-existing-message" @name="move-to-entity" @value="existing_message" @selection={{selection}} />
+        <RadioButton @id="move-to-existing-message" @name="move-to-entity" @value="existing_message" @selection={{this.selection}} />
         <b>{{i18n "topic.move_to_existing_message.radio_label"}}</b>
       </label>
     </div>
 
-    {{#if canSplitTopic}}
-      {{#if newMessage}}
-        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
+    {{#if this.canSplitTopic}}
+      {{#if this.newMessage}}
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=this.selectedPostsCount)}}</p>
         <form>
           <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
-          <TextField @value={{topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
+          <TextField @value={{this.topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
 
-          {{#if canTagMessages}}
+          {{#if this.canTagMessages}}
             <label>{{i18n "tagging.tags"}}</label>
-            <TagChooser @tags={{tags}} />
+            <TagChooser @tags={{this.tags}} />
           {{/if}}
         </form>
       {{/if}}
     {{/if}}
 
-    {{#if existingMessage}}
-      <p>{{html-safe (i18n "topic.move_to_existing_message.instructions" count=selectedPostsCount)}}</p>
+    {{#if this.existingMessage}}
+      <p>{{html-safe (i18n "topic.move_to_existing_message.instructions" count=this.selectedPostsCount)}}</p>
       <form>
-        <ChooseMessage @currentTopicId={{model.id}} @selectedTopicId={{selectedTopicId}} />
+        <ChooseMessage @currentTopicId={{this.model.id}} @selectedTopicId={{this.selectedTopicId}} />
 
         <label>{{i18n "topic.move_to_new_message.participants"}}</label>
-        <EmailGroupUserChooser @class="participant-selector" @value={{participants}} @onChange={{action (mut participants)}} />
+        <EmailGroupUserChooser @class="participant-selector" @value={{this.participants}} @onChange={{action (mut this.participants)}} />
       </form>
     {{/if}}
 
   {{else}}
 
     <div class="radios">
-      {{#if canSplitTopic}}
+      {{#if this.canSplitTopic}}
         <label class="radio-label" for="move-to-new-topic">
-          <RadioButton @id="move-to-new-topic" @name="move-to-entity" @value="new_topic" @selection={{selection}} />
+          <RadioButton @id="move-to-new-topic" @name="move-to-entity" @value="new_topic" @selection={{this.selection}} />
           <b>{{i18n "topic.split_topic.radio_label"}}</b>
         </label>
       {{/if}}
 
       <label class="radio-label" for="move-to-existing-topic">
-        <RadioButton @id="move-to-existing-topic" @name="move-to-entity" @value="existing_topic" @selection={{selection}} />
+        <RadioButton @id="move-to-existing-topic" @name="move-to-entity" @value="existing_topic" @selection={{this.selection}} />
         <b>{{i18n "topic.merge_topic.radio_label"}}</b>
       </label>
 
-      {{#if canSplitToPM}}
+      {{#if this.canSplitToPM}}
         <label class="radio-label" for="move-to-new-message">
-          <RadioButton @id="move-to-new-message" @name="move-to-entity" @value="new_message" @selection={{selection}} />
+          <RadioButton @id="move-to-new-message" @name="move-to-entity" @value="new_message" @selection={{this.selection}} />
           <b>{{i18n "topic.move_to_new_message.radio_label"}}</b>
         </label>
       {{/if}}
     </div>
 
-    {{#if existingTopic}}
-      <p>{{html-safe (i18n "topic.merge_topic.instructions" count=selectedPostsCount)}}</p>
+    {{#if this.existingTopic}}
+      <p>{{html-safe (i18n "topic.merge_topic.instructions" count=this.selectedPostsCount)}}</p>
       <form>
-        <ChooseTopic @currentTopicId={{model.id}} @selectedTopicId={{selectedTopicId}} />
+        <ChooseTopic @currentTopicId={{this.model.id}} @selectedTopicId={{this.selectedTopicId}} />
       </form>
     {{/if}}
 
-    {{#if canSplitTopic}}
-      {{#if newTopic}}
-        <p>{{html-safe (i18n "topic.split_topic.instructions" count=selectedPostsCount)}}</p>
+    {{#if this.canSplitTopic}}
+      {{#if this.newTopic}}
+        <p>{{html-safe (i18n "topic.split_topic.instructions" count=this.selectedPostsCount)}}</p>
         <form>
           <label>{{i18n "topic.split_topic.topic_name"}}</label>
-          <TextField @value={{topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
+          <TextField @value={{this.topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
 
           <label>{{i18n "categories.category"}}</label>
-          <CategoryChooser @value={{categoryId}} @class="small" @onChange={{action (mut categoryId)}} />
-          {{#if canAddTags}}
+          <CategoryChooser @value={{this.categoryId}} @class="small" @onChange={{action (mut this.categoryId)}} />
+          {{#if this.canAddTags}}
             <label>{{i18n "tagging.tags"}}</label>
-            <TagChooser @tags={{tags}} @categoryId={{categoryId}} />
+            <TagChooser @tags={{this.tags}} @categoryId={{this.categoryId}} />
           {{/if}}
         </form>
       {{/if}}
     {{/if}}
 
-    {{#if canSplitTopic}}
-      {{#if newMessage}}
-        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=selectedPostsCount)}}</p>
+    {{#if this.canSplitTopic}}
+      {{#if this.newMessage}}
+        <p>{{html-safe (i18n "topic.move_to_new_message.instructions" count=this.selectedPostsCount)}}</p>
         <form>
           <label>{{i18n "topic.move_to_new_message.message_title"}}</label>
-          <TextField @value={{topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
+          <TextField @value={{this.topicName}} @placeholderKey="composer.title_placeholder" @id="split-topic-name" />
 
-          {{#if canTagMessages}}
+          {{#if this.canTagMessages}}
             <label>{{i18n "tagging.tags"}}</label>
-            <TagChooser @tags={{tags}} />
+            <TagChooser @tags={{this.tags}} />
           {{/if}}
         </form>
       {{/if}}
@@ -106,5 +106,5 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @class="btn-primary" @disabled={{buttonDisabled}} @action={{action "performMove"}} @icon="sign-out-alt" @translatedLabel={{buttonTitle}} />
+  <DButton @class="btn-primary" @disabled={{this.buttonDisabled}} @action={{action "performMove"}} @icon="sign-out-alt" @translatedLabel={{this.buttonTitle}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
index 2240533f090..39bbab53c2a 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/not-activated.hbs
@@ -1,5 +1,5 @@
 <DModalBody>
-  {{html-safe (i18n "login.not_activated" sentTo=sentTo)}}
+  {{html-safe (i18n "login.not_activated" sentTo=this.sentTo)}}
 </DModalBody>
 
 <div class="modal-footer">
diff --git a/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs b/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs
index f1edd542f47..7249ab4ea6b 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/post-enqueued.hbs
@@ -1,7 +1,7 @@
 <DModalBody>
   <p>{{i18n "review.approval.description"}}</p>
 
-  <p>{{html-safe (i18n "review.approval.pending_posts" count=model.pending_count)}}</p>
+  <p>{{html-safe (i18n "review.approval.pending_posts" count=this.model.pending_count)}}</p>
 </DModalBody>
 <div class="modal-footer">
   <DButton @action={{route-action "closeModal"}} @class="btn-primary" @label="review.approval.ok" />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
index 862755a2b7a..4857f4f44c9 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/publish-page.hbs
@@ -1,46 +1,46 @@
 <DModalBody>
-  {{#if unpublished}}
+  {{#if this.unpublished}}
     <p>{{i18n "topic.publish_page.unpublished"}}</p>
   {{else}}
-    <ConditionalLoadingSpinner @condition={{initializing}}>
+    <ConditionalLoadingSpinner @condition={{this.initializing}}>
       <p class="publish-description">{{i18n "topic.publish_page.description"}}</p>
 
       <form>
         <div class="controls">
           <label>{{i18n "topic.publish_page.slug"}}</label>
-          <TextField @value={{publishedPage.slug}} @onChange={{action "checkSlug"}} @onChangeImmediate={{action "startCheckSlug"}} @disabled={{existing}} @class="publish-slug" />
+          <TextField @value={{this.publishedPage.slug}} @onChange={{action "checkSlug"}} @onChangeImmediate={{action "startCheckSlug"}} @disabled={{this.existing}} @class="publish-slug" />
         </div>
 
         <div class="controls">
           <label>{{i18n "topic.publish_page.public"}}</label>
 
           <p class="description">
-            <Input @type="checkbox" @checked={{readonly publishedPage.public}} @click={{action "onChangePublic" value="target.checked"}} />
+            <Input @type="checkbox" @checked={{readonly this.publishedPage.public}} @click={{action "onChangePublic" value="target.checked"}} />
             {{i18n "topic.publish_page.public_description"}}
           </p>
         </div>
       </form>
 
       <div class="publish-url">
-        <ConditionalLoadingSpinner @condition={{checking}} />
+        <ConditionalLoadingSpinner @condition={{this.checking}} />
 
-        {{#if existing}}
+        {{#if this.existing}}
           <div class="current-url">
             {{i18n "topic.publish_page.publish_url"}}
             <div>
-              <a href={{publishedPage.url}} target="_blank" rel="noopener noreferrer">{{publishedPage.url}}</a>
+              <a href={{this.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{this.publishedPage.url}}</a>
             </div>
           </div>
         {{else}}
-          {{#if showUrl}}
+          {{#if this.showUrl}}
             <div class="valid-slug">
               {{i18n "topic.publish_page.preview_url"}}
-              <div class="example-url">{{publishedPage.url}}</div>
+              <div class="example-url">{{this.publishedPage.url}}</div>
             </div>
           {{/if}}
 
-          {{#if invalid}}
-            {{i18n "topic.publish_page.invalid_slug"}} <span class="invalid-slug">{{reason}}.</span>
+          {{#if this.invalid}}
+            {{i18n "topic.publish_page.invalid_slug"}} <span class="invalid-slug">{{this.reason}}.</span>
           {{/if}}
         {{/if}}
 
@@ -50,13 +50,13 @@
 </DModalBody>
 
 <div class="modal-footer">
-  {{#if showUnpublish}}
-    <DButton @label="topic.publish_page.unpublish" @icon="trash-alt" @class="btn-danger" @isLoading={{unpublishing}} @action={{action "unpublish"}} />
+  {{#if this.showUnpublish}}
+    <DButton @label="topic.publish_page.unpublish" @icon="trash-alt" @class="btn-danger" @isLoading={{this.unpublishing}} @action={{action "unpublish"}} />
 
     <DButton @class="close-publish-page" @icon="times" @label="close" @action={{action "closeModal"}} />
-  {{else if unpublished}}
+  {{else if this.unpublished}}
     <DButton @label="topic.publish_page.publishing_settings" @action={{action "startNew"}} />
   {{else}}
-    <DButton @label="topic.publish_page.publish" @class="btn-primary publish-page" @icon="file" @disabled={{disabled}} @isLoading={{saving}} @action={{action "publish"}} />
+    <DButton @label="topic.publish_page.publish" @class="btn-primary publish-page" @icon="file" @disabled={{this.disabled}} @isLoading={{this.saving}} @action={{action "publish"}} />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
index 9f21a5c4f44..9b35710f24e 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/raw-email.hbs
@@ -1,31 +1,29 @@
 <DModalBody @title="raw_email.title" @class="incoming-email-modal" @maxHeight="80%">
   <div class="incoming-email-tabs">
-    <DButton @action={{action "displayRaw"}} @label="post.raw_email.displays.raw.button" @title="post.raw_email.displays.raw.title" @class={{if showRawEmail "active"}} />
+    <DButton @action={{action "displayRaw"}} @label="post.raw_email.displays.raw.button" @title="post.raw_email.displays.raw.title" @class={{if this.showRawEmail "active"}} />
 
-    {{#if textPart}}
-      <DButton @action={{action "displayTextPart"}} @label="post.raw_email.displays.text_part.button" @title="post.raw_email.displays.text_part.title" @class={{if showTextPart "active"}} />
+    {{#if this.textPart}}
+      <DButton @action={{action "displayTextPart"}} @label="post.raw_email.displays.text_part.button" @title="post.raw_email.displays.text_part.title" @class={{if this.showTextPart "active"}} />
     {{/if}}
 
-    {{#if htmlPart}}
-      <DButton @action={{action "displayHtmlPart"}} @label="post.raw_email.displays.html_part.button" @title="post.raw_email.displays.html_part.title" @class={{if showHtmlPart "active"}} />
+    {{#if this.htmlPart}}
+      <DButton @action={{action "displayHtmlPart"}} @label="post.raw_email.displays.html_part.button" @title="post.raw_email.displays.html_part.title" @class={{if this.showHtmlPart "active"}} />
     {{/if}}
   </div>
 
   <div class="incoming-email-content">
-    {{#if showRawEmail}}
-      {{#if rawEmail}}
-        <Textarea @value={{rawEmail}} />
+    {{#if this.showRawEmail}}
+      {{#if this.rawEmail}}
+        <Textarea @value={{this.rawEmail}} />
       {{else}}
         {{i18n "raw_email.not_available"}}
       {{/if}}
     {{/if}}
-
-    {{#if showTextPart}}
-      <Textarea @value={{textPart}} />
+    {{#if this.showTextPart}}
+      <Textarea @value={{this.textPart}} />
     {{/if}}
-
-    {{#if showHtmlPart}}
-      <IframedHtml @html={{htmlPart}} @className="incoming-email-html-part" />
+    {{#if this.showHtmlPart}}
+      <IframedHtml @html={{this.htmlPart}} @className="incoming-email-html-part" />
     {{/if}}
   </div>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
index bd1c939b3ee..55072c2b28f 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reject-reason-reviewable.hbs
@@ -1,8 +1,8 @@
 <DModalBody @class="explain-reviewable">
-  <Textarea @value={{rejectReason}} />
+  <Textarea @value={{this.rejectReason}} />
   <div class="control-group">
     <label>
-      <Input @type="checkbox" class="inline" @checked={{sendEmail}} />
+      <Input @type="checkbox" class="inline" @checked={{this.sendEmail}} />
       {{i18n "review.reject_reason.send_email"}}
     </label>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
index 6152a2822e5..6135d69bf33 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/reorder-categories.hbs
@@ -6,7 +6,7 @@
       <th class="th-pos">{{i18n "categories.reorder.position"}}</th>
     </thead>
     <tbody>
-      {{#each categoriesOrdered as |cat|}}
+      {{#each this.categoriesOrdered as |cat|}}
         <tr data-category-id={{cat.id}}>
           <td>
             <div class={{concat "reorder-categories-depth-" cat.depth}}>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
index 03c6ed189fb..f2e70d8e0ed 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/request-group-membership-form.hbs
@@ -1,18 +1,18 @@
 <form class="request-group-membership-form">
-  <DModalBody @rawTitle={{title}}>
+  <DModalBody @rawTitle={{this.title}}>
     <div class="control-group">
       <label>
         {{i18n "groups.membership_request.reason"}}
       </label>
 
-      <ExpandingTextArea @value={{reason}} />
+      <ExpandingTextArea @value={{this.reason}} />
     </div>
   </DModalBody>
 
   <div class="modal-footer">
-    <DButton @class="btn-primary" @disabled={{disableSubmit}} @label="groups.membership_request.submit" @action={{action "requestMember"}} />
+    <DButton @class="btn-primary" @disabled={{this.disableSubmit}} @label="groups.membership_request.submit" @action={{action "requestMember"}} />
 
     <DModalCancel @close={{route-action "closeModal"}} />
-    <ConditionalLoadingSpinner @size="small" @condition={{loading}} />
+    <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
index e2814580fab..919a88733f1 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-security-key.hbs
@@ -1,9 +1,9 @@
 <DModalBody>
-  <ConditionalLoadingSpinner @condition={{loading}}>
-    {{#if errorMessage}}
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
+    {{#if this.errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class="alert alert-error">{{errorMessage}}</div>
+          <div class="alert alert-error">{{this.errorMessage}}</div>
         </div>
       </div>
     {{/if}}
@@ -16,13 +16,13 @@
 
     <div class="control-group">
       <div class="controls">
-        <Input @value={{securityKeyName}} @id="security-key-name" placeholder="security key name" />
+        <Input @value={{this.securityKeyName}} @id="security-key-name" placeholder="security key name" />
       </div>
     </div>
 
     <div class="control-group">
       <div class="controls">
-        {{#unless webauthnUnsupported}}
+        {{#unless this.webauthnUnsupported}}
           <DButton @class="btn-primary add-security-key" @action={{action "registerSecurityKey"}} @label="user.second_factor.security_key.register" />
         {{/unless}}
       </div>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
index 034912dc828..ed5c02023f7 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-add-totp.hbs
@@ -1,9 +1,9 @@
 <DModalBody>
-  <ConditionalLoadingSpinner @condition={{loading}}>
-    {{#if errorMessage}}
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
+    {{#if this.errorMessage}}
       <div class="control-group">
         <div class="controls">
-          <div class="alert alert-error">{{errorMessage}}</div>
+          <div class="alert alert-error">{{this.errorMessage}}</div>
         </div>
       </div>
     {{/if}}
@@ -17,11 +17,11 @@
     <div class="control-group">
       <div class="controls">
         <div class="qr-code">
-          <img src={{html-safe secondFactorImage}}>
+          <img src={{html-safe this.secondFactorImage}}>
         </div>
         <p>
-          {{#if showSecondFactorKey}}
-            {{secondFactorKey}}
+          {{#if this.showSecondFactorKey}}
+            {{this.secondFactorKey}}
           {{else}}
             <a href {{action "showSecondFactorKey"}}>{{i18n "user.second_factor.show_key_description"}}</a>
           {{/if}}
@@ -32,12 +32,12 @@
     <div class="control-group">
       <label class="control-label input-prepend">{{i18n "user.second_factor.name"}}</label>
       <div class="controls">
-        <SecondFactorInput @value={{secondFactorName}} @inputId="second-factor-name" @placeholder={{i18n "user.second_factor.totp.default_name"}} />
+        <SecondFactorInput @value={{this.secondFactorName}} @inputId="second-factor-name" @placeholder={{i18n "user.second_factor.totp.default_name"}} />
       </div>
 
       <label class="control-label input-prepend">{{i18n "user.second_factor.label"}}</label>
       <div class="controls">
-        <TextField @class="second-factor-token-input" @maxlength={{6}} @value={{secondFactorToken}} @inputId="second-factor-token" @placeholder="123456" @autocorrect="off" @autocapitalize="off" @autofocus="autofocus" />
+        <TextField @class="second-factor-token-input" @maxlength={{6}} @value={{this.secondFactorToken}} @inputId="second-factor-token" @placeholder="123456" @autocorrect="off" @autocapitalize="off" @autofocus="autofocus" />
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
index 29abdc30cc6..292b79f04c9 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-backup-edit.hbs
@@ -1,40 +1,40 @@
 <DModalBody>
   <section class="user-preferences solo-preference  second-factor-backup-preferences">
     <form class="form-horizontal">
-      {{#if successMessage}}
+      {{#if this.successMessage}}
         <div class="alert alert-success">
-          {{successMessage}}
+          {{this.successMessage}}
         </div>
       {{/if}}
 
-      {{#if errorMessage}}
+      {{#if this.errorMessage}}
         <div class="alert alert-error">
-          {{errorMessage}}
+          {{this.errorMessage}}
         </div>
       {{/if}}
 
-      {{#if backupEnabled}}
-        {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=remainingCodes)}}
+      {{#if this.backupEnabled}}
+        {{html-safe (i18n "user.second_factor_backup.remaining_codes" count=this.remainingCodes)}}
       {{/if}}
 
       <div class="actions">
-        {{#if backupEnabled}}
-          <DButton @class="btn-primary" @icon="redo" @action={{action "generateSecondFactorCodes"}} @type="submit" @isLoading={{loading}} @label="user.second_factor_backup.regenerate" />
-          <DButton @class="btn-danger" @icon="ban" @action={{action "disableSecondFactorBackup"}} @disabled={{loading}} @label="user.second_factor_backup.disable" />
+        {{#if this.backupEnabled}}
+          <DButton @class="btn-primary" @icon="redo" @action={{action "generateSecondFactorCodes"}} @type="submit" @isLoading={{this.loading}} @label="user.second_factor_backup.regenerate" />
+          <DButton @class="btn-danger" @icon="ban" @action={{action "disableSecondFactorBackup"}} @disabled={{this.loading}} @label="user.second_factor_backup.disable" />
         {{else}}
-          <DButton @class="btn-primary" @action={{action "generateSecondFactorCodes"}} @type="submit" @disabled={{loading}} @label="user.second_factor_backup.enable" />
+          <DButton @class="btn-primary" @action={{action "generateSecondFactorCodes"}} @type="submit" @disabled={{this.loading}} @label="user.second_factor_backup.enable" />
         {{/if}}
       </div>
 
-      <ConditionalLoadingSection @isLoading={{loading}}>
-        {{#if backupCodes}}
+      <ConditionalLoadingSection @isLoading={{this.loading}}>
+        {{#if this.backupCodes}}
           <h3>{{i18n "user.second_factor_backup.codes.title"}}</h3>
 
           <p>
             {{i18n "user.second_factor_backup.codes.description"}}
           </p>
 
-          <BackupCodes @copyBackupCode={{action "copyBackupCode"}} @backupCodes={{backupCodes}} />
+          <BackupCodes @copyBackupCode={{action "copyBackupCode"}} @backupCodes={{this.backupCodes}} />
         {{/if}}
       </ConditionalLoadingSection>
     </form>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
index 1031dc7c31b..50b9e64eb14 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit-security-key.hbs
@@ -2,7 +2,7 @@
   <form class="form-horizontal">
     <div class="input-group">
       <label for="security-key-name">{{i18n "user.second_factor.security_key.edit_description"}}</label>
-      <Input @name="security-key-name" @type="text" @value={{model.name}} />
+      <Input @name="security-key-name" @type="text" @value={{this.model.name}} />
     </div>
   </form>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
index 6ac110e9aac..0b6f6dda30d 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/second-factor-edit.hbs
@@ -2,7 +2,7 @@
   <form class="form-horizontal">
     <div class="input-group">
       <label for="authenticator-name">{{i18n "user.second_factor.edit_description"}}</label>
-      <Input @name="authenticator-name" @type="text" @value={{model.name}} />
+      <Input @name="authenticator-name" @type="text" @value={{this.model.name}} />
     </div>
   </form>
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs
index 3d33f99a391..46f900631e4 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/share-and-invite.hbs
@@ -1,3 +1,3 @@
 <DModalBody>
-  <ModalPanel @panel={{modal.selectedPanel}} />
+  <ModalPanel @panel={{this.modal.selectedPanel}} />
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
index df999825f5f..56813223281 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/share-topic.hbs
@@ -1,27 +1,27 @@
-<DModalBody @rawTitle={{if post (i18n "post.share.title" post_number=post.post_number) (i18n "topic.share.title")}} @rawSubtitle={{if post displayDate}}>
+<DModalBody @rawTitle={{if this.post (i18n "post.share.title" post_number=this.post.post_number) (i18n "topic.share.title")}} @rawSubtitle={{if this.post this.displayDate}}>
   <form>
     <div class="input-group invite-link">
       <label for="invite-link">
-        {{if post (i18n "post.share.instructions" post_number=post.post_number) (i18n "topic.share.instructions")}}
+        {{if this.post (i18n "post.share.instructions" post_number=this.post.post_number) (i18n "topic.share.instructions")}}
       </label>
       <div class="link-share-container">
-        <Input @name="invite-link" class="invite-link" @value={{url}} @readonly={{true}} />
+        <Input @name="invite-link" class="invite-link" @value={{this.url}} @readonly={{true}} />
         <CopyButton @selector="input.invite-link" />
       </div>
     </div>
 
     <div class="link-share-actions">
       <div class="sources">
-        {{#each sources as |s|}}
-          <ShareSource @source={{s}} @title={{topic.title}} @action={{action "share"}} />
+        {{#each this.sources as |s|}}
+          <ShareSource @source={{s}} @title={{this.topic.title}} @action={{action "share"}} />
         {{/each}}
 
-        {{#if allowInvites}}
+        {{#if this.allowInvites}}
           <DButton @class="btn-default invite" @label="topic.share.invite_users" @icon="user-plus" @action={{action "inviteUsers"}} />
         {{/if}}
 
-        {{#if topic.details.can_reply_as_new_topic}}
-          {{#if topic.isPrivateMessage}}
+        {{#if this.topic.details.can_reply_as_new_topic}}
+          {{#if this.topic.isPrivateMessage}}
             <DButton @action={{action "replyAsNewTopic"}} @class="btn-default new-topic" @icon="plus" @aria-label="post.reply_as_new_private_message" @title="post.reply_as_new_private_message" @label="user.new_private_message" />
           {{else}}
             <DButton @action={{action "replyAsNewTopic"}} @class="btn-default new-topic" @icon="plus" @aria-label="post.reply_as_new_topic" @title="post.reply_as_new_topic" @label="topic.create" />
diff --git a/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs b/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
index 80c7bd6175b..1c3ca9a0a83 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/topic-bulk-actions.hbs
@@ -1,4 +1,4 @@
 <DModalBody>
-  <p>{{html-safe (i18n "topics.bulk.selected" count=model.topics.length)}}</p>
+  <p>{{html-safe (i18n "topics.bulk.selected" count=this.model.topics.length)}}</p>
   {{outlet "bulkOutlet"}}
 </DModalBody>
diff --git a/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs b/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
index 08068656eab..95d16a7f192 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/user-status.hbs
@@ -1,28 +1,28 @@
 <DModalBody>
-  <ConditionalLoadingSpinner @condition={{loading}}>
+  <ConditionalLoadingSpinner @condition={{this.loading}}>
     <div class="control-group">
-      <UserStatusPicker @emoji={{emoji}} @description={{description}} />
+      <UserStatusPicker @emoji={{this.emoji}} @description={{this.description}} />
     </div>
     <div class="control-group control-group-remove-status">
       <label class="control-label">
         {{i18n "user_status.remove_status"}}
       </label>
       <TimeShortcutPicker
-        @timeShortcuts={{timeShortcuts}}
-        @hiddenOptions={{hiddenTimeShortcutOptions}}
-        @customLabels={{customTimeShortcutLabels}}
-        @prefilledDatetime={{prefilledDateTime}}
+        @timeShortcuts={{this.timeShortcuts}}
+        @hiddenOptions={{this.hiddenTimeShortcutOptions}}
+        @customLabels={{this.customTimeShortcutLabels}}
+        @prefilledDatetime={{this.prefilledDateTime}}
         @onTimeSelected={{action "onTimeSelected"}}
-        @_itsatrap={{_itsatrap}} />
+        @_itsatrap={{this._itsatrap}} />
     </div>
     <div class="modal-footer control-group">
       <DButton
         @label="user_status.save"
         @class="btn-primary"
-        @disabled={{not statusIsSet}}
+        @disabled={{not this.statusIsSet}}
         @action={{action "saveAndClose"}} />
       <DModalCancel @close={{action "closeModal"}} />
-      {{#if showDeleteButton}}
+      {{#if this.showDeleteButton}}
         <DButton @icon="trash-alt" @class="delete-status btn-danger" @action={{action "delete"}} />
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
index 16cbed57efc..683b3a48489 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/categories.hbs
@@ -1,3 +1,3 @@
 <DSection @bodyClass="navigation-categories" @class="navigation-container">
-  <DNavigation @filterType="categories" @showCategoryAdmin={{showCategoryAdmin}} @createCategory={{route-action "createCategory"}} @reorderCategories={{route-action "reorderCategories"}} @canCreateTopic={{canCreateTopic}} @hasDraft={{currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} />
+  <DNavigation @filterType="categories" @showCategoryAdmin={{this.showCategoryAdmin}} @createCategory={{route-action "createCategory"}} @reorderCategories={{route-action "reorderCategories"}} @canCreateTopic={{this.canCreateTopic}} @hasDraft={{this.currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} />
 </DSection>
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
index 945a54cf87f..b60bb7159d6 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/category.hbs
@@ -1,19 +1,19 @@
-<AddCategoryTagClasses @category={{category}} />
+<AddCategoryTagClasses @category={{this.category}} />
 
 <section class="category-heading">
-  {{#if category.uploaded_logo.url}}
-    <CdnImg @src={{category.uploaded_logo.url}} @class="category-logo" @width={{category.uploaded_logo.width}} @height={{category.uploaded_logo.height}} @alt="" />
+  {{#if this.category.uploaded_logo.url}}
+    <CdnImg @src={{this.category.uploaded_logo.url}} @class="category-logo" @width={{this.category.uploaded_logo.width}} @height={{this.category.uploaded_logo.height}} @alt="" />
 
-    {{#if category.description}}
-      <p>{{dir-span category.description htmlSafe="true"}}</p>
+    {{#if this.category.description}}
+      <p>{{dir-span this.category.description htmlSafe="true"}}</p>
     {{/if}}
   {{/if}}
 
-  <PluginOutlet @name="category-heading" @tagName="span" @connectorTagName="div" @args={{hash category=category}} />
+  <PluginOutlet @name="category-heading" @tagName="span" @connectorTagName="div" @args={{hash category=this.category}} />
 </section>
 
 <DSection @class="navigation-container category-navigation">
-  <DNavigation @category={{category}} @filterMode={{filterMode}} @noSubcategories={{noSubcategories}} @canCreateTopic={{canCreateTopic}} @createTopic={{route-action "createTopic"}} @createTopicDisabled={{cannotCreateTopicOnCategory}} @hasDraft={{currentUser.has_topic_draft}} @editCategory={{route-action "editCategory" category}} />
+  <DNavigation @category={{this.category}} @filterMode={{this.filterMode}} @noSubcategories={{this.noSubcategories}} @canCreateTopic={{this.canCreateTopic}} @createTopic={{route-action "createTopic"}} @createTopicDisabled={{this.cannotCreateTopicOnCategory}} @hasDraft={{this.currentUser.has_topic_draft}} @editCategory={{route-action "editCategory" this.category}} />
 
-  <PluginOutlet @name="category-navigation" @connectorTagName="div" @args={{hash category=category}} />
+  <PluginOutlet @name="category-navigation" @connectorTagName="div" @args={{hash category=this.category}} />
 </DSection>
diff --git a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
index fc74d69ee40..4c7cd802b33 100644
--- a/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/app/templates/navigation/default.hbs
@@ -1,3 +1,3 @@
 <DSection @bodyClass="navigation-topics" @class="navigation-container" @scrollTop={{false}}>
-  <DNavigation @filterMode={{filterMode}} @canCreateTopic={{canCreateTopic}} @hasDraft={{currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @skipCategoriesNavItem={{skipCategoriesNavItem}} />
+  <DNavigation @filterMode={{this.filterMode}} @canCreateTopic={{this.canCreateTopic}} @hasDraft={{this.currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @skipCategoriesNavItem={{this.skipCategoriesNavItem}} />
 </DSection>
diff --git a/app/assets/javascripts/discourse/app/templates/outlet-list.hbs b/app/assets/javascripts/discourse/app/templates/outlet-list.hbs
index 46605c7448e..cd9d4455dc6 100644
--- a/app/assets/javascripts/discourse/app/templates/outlet-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/outlet-list.hbs
@@ -1 +1 @@
-{{connector templateId=templateId class=outletClasses tagName=tagName}}
+{{connector templateId=this.templateId class=this.outletClasses tagName=this.tagName}}
diff --git a/app/assets/javascripts/discourse/app/templates/password-reset.hbs b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
index 5c3faaa94e1..4ce19d48670 100644
--- a/app/assets/javascripts/discourse/app/templates/password-reset.hbs
+++ b/app/assets/javascripts/discourse/app/templates/password-reset.hbs
@@ -1,47 +1,47 @@
 <div class="container password-reset clearfix">
   <div class="pull-left col-image">
-    <img src={{lockImageUrl}} class="password-reset-img" alt={{i18n "user.change_password.emoji"}}>
+    <img src={{this.lockImageUrl}} class="password-reset-img" alt={{i18n "user.change_password.emoji"}}>
   </div>
 
   <div class="pull-left col-form">
-    {{#if successMessage}}
-      <p>{{successMessage}}</p>
+    {{#if this.successMessage}}
+      <p>{{this.successMessage}}</p>
 
-      {{#if requiresApproval}}
+      {{#if this.requiresApproval}}
         <p>{{i18n "login.not_approved"}}</p>
       {{else}}
-        {{#unless redirected}}
-          <a class="btn" href={{redirectHref}} {{action "done"}}>{{continueButtonText}}</a>
+        {{#unless this.redirected}}
+          <a class="btn" href={{this.redirectHref}} {{action "done"}}>{{this.continueButtonText}}</a>
         {{/unless}}
       {{/if}}
     {{else}}
       <form>
-        {{#if securityKeyOrSecondFactorRequired }}
-          {{#if errorMessage}}
-            <div class="alert alert-error">{{errorMessage}}</div>
+        {{#if this.securityKeyOrSecondFactorRequired }}
+          {{#if this.errorMessage}}
+            <div class="alert alert-error">{{this.errorMessage}}</div>
             <br>
           {{/if}}
-          {{#if securityKeyRequired }}
-            <SecurityKeyForm @allowedCredentialIds={{model.allowed_credential_ids}} @challenge={{model.security_key_challenge}} @showSecurityKey={{model.security_key_required}} @showSecondFactor={{false}} @secondFactorMethod={{secondFactorMethod}} @otherMethodAllowed={{otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
+          {{#if this.securityKeyRequired }}
+            <SecurityKeyForm @allowedCredentialIds={{this.model.allowed_credential_ids}} @challenge={{this.model.security_key_challenge}} @showSecurityKey={{this.model.security_key_required}} @showSecondFactor={{false}} @secondFactorMethod={{this.secondFactorMethod}} @otherMethodAllowed={{this.otherMethodAllowed}} @action={{action "authenticateSecurityKey"}}>
             </SecurityKeyForm>
           {{else}}
-            <SecondFactorForm @secondFactorMethod={{secondFactorMethod}} @secondFactorToken={{secondFactorToken}} @backupEnabled={{backupEnabled}} @isLogin={{false}}>
-              <SecondFactorInput @value={{secondFactorToken}} @inputId="second-factor" @secondFactorMethod={{secondFactorMethod}} @backupEnabled={{backupEnabled}} />
+            <SecondFactorForm @secondFactorMethod={{this.secondFactorMethod}} @secondFactorToken={{this.secondFactorToken}} @backupEnabled={{this.backupEnabled}} @isLogin={{false}}>
+              <SecondFactorInput @value={{this.secondFactorToken}} @inputId="second-factor" @secondFactorMethod={{this.secondFactorMethod}} @backupEnabled={{this.backupEnabled}} />
             </SecondFactorForm>
           {{/if}}
-          {{#unless securityKeyRequired }}
+          {{#unless this.securityKeyRequired }}
             <DButton @action={{action "submit"}} @class="btn-primary" @label="submit" @type="submit" />
           {{/unless}}
         {{else}}
           <h2>{{i18n "user.change_password.choose"}}</h2>
 
           <div class="input">
-            <PasswordField @value={{accountPassword}} @type="password" @id="new-account-password" @capsLockOn={{capsLockOn}} @autofocus="autofocus" />
-            &nbsp;<InputTip @validation={{passwordValidation}} />
+            <PasswordField @value={{this.accountPassword}} @type="password" @id="new-account-password" @capsLockOn={{this.capsLockOn}} @autofocus="autofocus" />
+            &nbsp;<InputTip @validation={{this.passwordValidation}} />
           </div>
 
           <div class="instructions">
-            <div class="caps-lock-warning {{unless capsLockOn "invisible"}}">
+            <div class="caps-lock-warning {{unless this.capsLockOn "invisible"}}">
               {{d-icon "exclamation-triangle"}} {{i18n "login.caps_lock_warning"}}
             </div>
           </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
index 439f04f26f9..9d3e90ce39f 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-email.hbs
@@ -4,23 +4,23 @@
 
       <div class="control-group">
         <div class="controls">
-          <h3>{{i18n (if new "user.add_email.title" "user.change_email.title")}}</h3>
+          <h3>{{i18n (if this.new "user.add_email.title" "user.change_email.title")}}</h3>
         </div>
       </div>
 
-      {{#if success}}
+      {{#if this.success}}
         <div class="control-group">
           <div class="controls">
             <div class="instructions">
-              <p>{{ successMessage }}</p>
+              <p>{{ this.successMessage }}</p>
             </div>
           </div>
         </div>
       {{else}}
-        {{#if error}}
+        {{#if this.error}}
           <div class="control-group">
             <div class="controls">
-              <div class="alert alert-error">{{errorMessage}}</div>
+              <div class="alert alert-error">{{this.errorMessage}}</div>
             </div>
           </div>
         {{/if}}
@@ -28,12 +28,12 @@
         <div class="control-group">
           <label class="control-label">{{i18n "user.email.title"}}</label>
           <div class="controls">
-            <TextField @value={{newEmail}} @id="change-email" @classNames="input-xxlarge" @autofocus="autofocus" />
-            <InputTip @validation={{emailValidation}} />
+            <TextField @value={{this.newEmail}} @id="change-email" @classNames="input-xxlarge" @autofocus="autofocus" />
+            <InputTip @validation={{this.emailValidation}} />
           </div>
           <div class="controls">
             <div class="instructions">
-              {{#if taken}}
+              {{#if this.taken}}
                 {{i18n "user.change_email.taken"}}
               {{else}}
                 {{i18n "user.email.instructions"}}
@@ -44,7 +44,7 @@
 
         <div class="control-group">
           <div class="controls">
-            <DButton @class="btn-primary" @action={{action "saveEmail"}} @type="submit" @disabled={{saveDisabled}} @translatedLabel={{saveButtonText}} />
+            <DButton @class="btn-primary" @action={{action "saveEmail"}} @type="submit" @disabled={{this.saveDisabled}} @translatedLabel={{this.saveButtonText}} />
           </div>
         </div>
       {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
index 2683bc42071..debb8266e54 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-second-factor.hbs
@@ -1,8 +1,8 @@
 <DSection @pageClass="user-preferences" @tagName="">
   <section class="user-preferences solo-preference second-factor">
-    <ConditionalLoadingSpinner @condition={{loading}}>
+    <ConditionalLoadingSpinner @condition={{this.loading}}>
       <form class="form-horizontal">
-        {{#if showEnforcedNotice}}
+        {{#if this.showEnforcedNotice}}
           <div class="control-group">
             <div class="controls">
               <div class="alert alert-error">{{i18n "user.second_factor.enforced_notice"}}</div>
@@ -10,7 +10,7 @@
           </div>
         {{/if}}
 
-        {{#if displayOAuthWarning}}
+        {{#if this.displayOAuthWarning}}
           <div class="control-group">
             <div class="controls">
               {{i18n "user.second_factor.oauth_enabled_warning"}}
@@ -18,20 +18,20 @@
           </div>
         {{/if}}
 
-        {{#if errorMessage}}
+        {{#if this.errorMessage}}
           <div class="control-group">
             <div class="controls">
-              <div class="alert alert-error">{{errorMessage}}</div>
+              <div class="alert alert-error">{{this.errorMessage}}</div>
             </div>
           </div>
         {{/if}}
 
-        {{#if loaded}}
+        {{#if this.loaded}}
           <div class="control-group totp">
             <div class="controls">
               <h2>{{i18n "user.second_factor.totp.title"}}</h2>
-              <DButton @action={{action "createTotp"}} @class="btn-primary new-totp" @icon="plus" @disabled={{loading}} @label="user.second_factor.totp.add" />
-              {{#each totps as |totp|}}
+              <DButton @action={{action "createTotp"}} @class="btn-primary new-totp" @icon="plus" @disabled={{this.loading}} @label="user.second_factor.totp.add" />
+              {{#each this.totps as |totp|}}
                 <div class="second-factor-item">
                   {{#if totp.name}}
                     {{totp.name}}
@@ -39,8 +39,8 @@
                     {{i18n "user.second_factor.totp.default_name"}}
                   {{/if}}
 
-                  {{#if isCurrentUser}}
-                    <DButton @action={{action "editSecondFactor" totp}} @class="btn-default btn-small btn-icon pad-left no-text edit" @disabled={{loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
+                  {{#if this.isCurrentUser}}
+                    <DButton @action={{action "editSecondFactor" totp}} @class="btn-default btn-small btn-icon pad-left no-text edit" @disabled={{this.loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
                   {{/if}}
                 </div>
               {{/each}}
@@ -50,8 +50,8 @@
           <div class="control-group security-key">
             <div class="controls">
               <h2>{{i18n "user.second_factor.security_key.title"}}</h2>
-              <DButton @action={{action "createSecurityKey"}} @class="btn-primary new-security-key" @icon="plus" @disabled={{loading}} @label="user.second_factor.security_key.add" />
-              {{#each security_keys as |security_key|}}
+              <DButton @action={{action "createSecurityKey"}} @class="btn-primary new-security-key" @icon="plus" @disabled={{this.loading}} @label="user.second_factor.security_key.add" />
+              {{#each this.security_keys as |security_key|}}
                 <div class="second-factor-item">
                   {{#if security_key.name}}
                     {{security_key.name}}
@@ -59,8 +59,8 @@
                     {{i18n "user.second_factor.security_key.default_name"}}
                   {{/if}}
 
-                  {{#if isCurrentUser}}
-                    <DButton @action={{action "editSecurityKey" security_key}} @class="btn-default btn-small btn-icon pad-left no-text edit" @disabled={{loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
+                  {{#if this.isCurrentUser}}
+                    <DButton @action={{action "editSecurityKey" security_key}} @class="btn-default btn-small btn-icon pad-left no-text edit" @disabled={{this.loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
                   {{/if}}
                 </div>
               {{/each}}
@@ -70,15 +70,15 @@
           <div class="control-group pref-second-factor-backup">
             <div class="controls pref-second-factor-backup">
               <h2>{{i18n "user.second_factor_backup.title"}}</h2>
-              {{#if model.second_factor_enabled}}
-                {{#if model.second_factor_backup_enabled}}
-                  {{html-safe (i18n "user.second_factor_backup.manage" count=model.second_factor_remaining_backup_codes)}}
+              {{#if this.model.second_factor_enabled}}
+                {{#if this.model.second_factor_backup_enabled}}
+                  {{html-safe (i18n "user.second_factor_backup.manage" count=this.model.second_factor_remaining_backup_codes)}}
                 {{else}}
                   {{i18n "user.second_factor_backup.enable_long"}}
                 {{/if}}
 
-                {{#if isCurrentUser}}
-                  <DButton @action={{action "editSecondFactorBackup"}} @class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup" @disabled={{loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
+                {{#if this.isCurrentUser}}
+                  <DButton @action={{action "editSecondFactorBackup"}} @class="btn-default btn-small btn-icon pad-left no-text edit edit-2fa-backup" @disabled={{this.loading}} @icon="pencil-alt" @aria-label="user.second_factor.edit" @title="user.second_factor.edit" />
                 {{/if}}
               {{else}}
                 {{i18n "user.second_factor_backup.enable_prerequisites"}}
@@ -86,11 +86,11 @@
             </div>
           </div>
 
-          {{#if model.second_factor_enabled}}
-            {{#unless showEnforcedNotice}}
+          {{#if this.model.second_factor_enabled}}
+            {{#unless this.showEnforcedNotice}}
               <div class="control-group">
                 <div class="controls">
-                  <DButton @class="btn-danger" @icon="ban" @action={{action "disableAllSecondFactors"}} @disabled={{loading}} @label="user.second_factor.disable_all" />
+                  <DButton @class="btn-danger" @icon="ban" @action={{action "disableAllSecondFactors"}} @disabled={{this.loading}} @label="user.second_factor.disable_all" />
                 </div>
               </div>
             {{/unless}}
@@ -101,7 +101,7 @@
 
             <div class="controls">
               <div>
-                <TextField @value={{password}} @id="password" @type="password" @classNames="input-large" @autofocus="autofocus" />
+                <TextField @value={{this.password}} @id="password" @type="password" @classNames="input-large" @autofocus="autofocus" />
               </div>
               <div class="instructions">
                 {{i18n "user.second_factor.confirm_password_description"}}
@@ -111,15 +111,15 @@
 
           <div class="control-group">
             <div class="controls">
-              <DButton @class="btn-primary" @type="submit" @action={{action "confirmPassword"}} @disabled={{loading}} @label="continue" />
+              <DButton @class="btn-primary" @type="submit" @action={{action "confirmPassword"}} @disabled={{this.loading}} @label="continue" />
 
-              {{#unless showEnforcedNotice}}
-                <CancelLink @route="preferences.account" @args={{model.username}} />
+              {{#unless this.showEnforcedNotice}}
+                <CancelLink @route="preferences.account" @args={{this.model.username}} />
               {{/unless}}
             </div>
             <div class="controls" style="margin-top: 5px">
-              {{resetPasswordProgress}}
-              {{#unless resetPasswordLoading}}
+              {{this.resetPasswordProgress}}
+              {{#unless this.resetPasswordLoading}}
                 <a href class="instructions" {{action "resetPassword"}}>{{ i18n "user.second_factor.forgot_password" }}</a>
               {{/unless}}
             </div>
diff --git a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
index 0df5b239a34..da357b2705a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences-username.hbs
@@ -11,22 +11,22 @@
       <div class="control-group">
         <label for="change_username" class="control-label">{{i18n "user.username.title"}}</label>
         <div class="controls">
-          <TextField @value={{newUsername}} @id="change_username" @classNames="input-xxlarge" @maxlength={{maxLength}} @autofocus="autofocus" @insert-newline="changeUsername" />
+          <TextField @value={{this.newUsername}} @id="change_username" @classNames="input-xxlarge" @maxlength={{this.maxLength}} @autofocus="autofocus" @insert-newline="changeUsername" />
         </div>
         <div class="instructions controls">
           <p>
-            {{#if taken}}
+            {{#if this.taken}}
               {{i18n "user.change_username.taken"}}
             {{/if}}
-            <span>{{errorMessage}}</span>
+            <span>{{this.errorMessage}}</span>
           </p>
         </div>
       </div>
 
       <div class="control-group">
         <div class="controls">
-          <DButton @class="btn-primary" @action={{action "changeUsername"}} @type="submit" @disabled={{saveDisabled}} @translatedLabel={{saveButtonText}} />
-          {{#if saved}}{{i18n "saved"}}{{/if}}
+          <DButton @class="btn-primary" @action={{action "changeUsername"}} @type="submit" @disabled={{this.saveDisabled}} @translatedLabel={{this.saveButtonText}} />
+          {{#if this.saved}}{{i18n "saved"}}{{/if}}
         </div>
       </div>
 
diff --git a/app/assets/javascripts/discourse/app/templates/preferences.hbs b/app/assets/javascripts/discourse/app/templates/preferences.hbs
index facdae03058..7634b37f9b5 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences.hbs
@@ -25,7 +25,7 @@
         {{i18n "user.preferences_nav.notifications"}}
       </LinkTo>
     </li>
-    {{#if model.can_change_tracking_preferences}}
+    {{#if this.model.can_change_tracking_preferences}}
       <li class="indent nav-categories">
         <LinkTo @route="preferences.categories">
           {{i18n "user.preferences_nav.categories"}}
@@ -37,7 +37,7 @@
         {{i18n "user.preferences_nav.users"}}
       </LinkTo>
     </li>
-    {{#if (and model.can_change_tracking_preferences siteSettings.tagging_enabled)}}
+    {{#if (and this.model.can_change_tracking_preferences this.siteSettings.tagging_enabled)}}
       <li class="indent nav-tags">
         <LinkTo @route="preferences.tags">
           {{i18n "user.preferences_nav.tags"}}
@@ -58,21 +58,21 @@
       </li>
     {{/if}}
 
-    <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+    <PluginOutlet @name="user-preferences-nav-under-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-    {{#if model.userApiKeys}}
+    {{#if this.model.userApiKeys}}
       <li class="nav-apps">
         <LinkTo @route="preferences.apps">
           {{i18n "user.preferences_nav.apps"}}
         </LinkTo>
       </li>
     {{/if}}
-    <PluginOutlet @name="user-preferences-nav" @tagName="span" @connectorTagName="li" @args={{hash model=model}} />
+    <PluginOutlet @name="user-preferences-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
   </MobileNav>
 </DSection>
 
 <section class="user-content user-preferences">
-  <PluginOutlet @name="above-user-preferences" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+  <PluginOutlet @name="above-user-preferences" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
   <form class="form-vertical">
     {{outlet}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
index 2642e11e28b..4df46f3499a 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/account.hbs
@@ -1,40 +1,40 @@
 <div class="control-group pref-username">
   <label class="control-label">{{i18n "user.username.title"}}</label>
   <div class="controls">
-    <span class="static">{{model.username}}</span>
-    {{#if model.can_edit_username}}
+    <span class="static">{{this.model.username}}</span>
+    {{#if this.model.can_edit_username}}
       <LinkTo @route="preferences.username" @name={{i18n "user.username.edit"}} class="btn btn-default btn-small btn-icon pad-left no-text">
         {{d-icon "pencil-alt"}}
       </LinkTo>
     {{/if}}
   </div>
-  {{#if siteSettings.enable_mentions}}
+  {{#if this.siteSettings.enable_mentions}}
     <div class="instructions">
-      {{html-safe (i18n "user.username.short_instructions" username=model.username)}}
+      {{html-safe (i18n "user.username.short_instructions" username=this.model.username)}}
     </div>
   {{/if}}
 </div>
 
-{{#unless siteSettings.discourse_connect_overrides_avatar}}
+{{#unless this.siteSettings.discourse_connect_overrides_avatar}}
   <div class="control-group pref-avatar">
     <label class="control-label" id="profile-picture">{{i18n "user.avatar.title"}}</label>
     <div class="controls">
       {{! we want the "huge" version even though we're downsizing it in CSS }}
-      {{bound-avatar model "huge"}}
-      <DButton @action={{route-action "showAvatarSelector"}} @actionParam={{model}} @class="btn-default pad-left" @icon="pencil-alt" />
+      {{bound-avatar this.model "huge"}}
+      <DButton @action={{route-action "showAvatarSelector"}} @actionParam={{this.model}} @class="btn-default pad-left" @icon="pencil-alt" />
     </div>
   </div>
 {{/unless}}
 
-{{#if canCheckEmails}}
+{{#if this.canCheckEmails}}
   <div class="control-group pref-email">
     <label class="control-label">{{i18n "user.email.title"}}</label>
-    {{#if model.email}}
-      {{#if siteSettings.enable_secondary_emails}}
+    {{#if this.model.email}}
+      {{#if this.siteSettings.enable_secondary_emails}}
         <div class="emails">
-          {{#each emails as |email|}}
+          {{#each this.emails as |email|}}
             <div class="row email">
-              {{#if model.can_edit_email}}
+              {{#if this.model.can_edit_email}}
                 <EmailDropdown @email={{email}} @setPrimaryEmail={{action "setPrimaryEmail"}} @destroyEmail={{action "destroyEmail"}} />
               {{/if}}
 
@@ -61,48 +61,48 @@
           {{/each}}
         </div>
 
-        {{#if model.can_edit_email}}
+        {{#if this.model.can_edit_email}}
           <LinkTo @route="preferences.email" @query={{hash new=1}} class="pull-right">
             {{d-icon "plus"}} {{i18n "user.email.add_email"}}
           </LinkTo>
         {{/if}}
       {{else}}
         <div class="controls">
-          <span class="static">{{model.email}}</span>
-          {{#if model.can_edit_email}}
+          <span class="static">{{this.model.email}}</span>
+          {{#if this.model.can_edit_email}}
             <LinkTo @route="preferences.email" class="btn btn-default btn-small btn-icon pad-left no-text">{{d-icon "pencil-alt"}}</LinkTo>
           {{/if}}
         </div>
       {{/if}}
 
       <div class="instructions">
-        {{#if siteSettings.auth_overrides_email}}
+        {{#if this.siteSettings.auth_overrides_email}}
           {{i18n "user.email.auth_override_instructions"}}
         {{/if}}
         {{i18n "user.email.instructions"}}
       </div>
     {{else}}
       <div class="controls">
-        <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
+        <DButton @action={{route-action "checkEmail"}} @class="btn-default" @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
       </div>
     {{/if}}
   </div>
 {{/if}}
 
-{{#if canUpdateAssociatedAccounts}}
+{{#if this.canUpdateAssociatedAccounts}}
   <div class="control-group pref-associated-accounts">
     <label class="control-label">{{i18n "user.associated_accounts.title"}}</label>
-    {{#if associatedAccountsLoaded}}
+    {{#if this.associatedAccountsLoaded}}
       <table>
         <tbody>
-          {{#each authProviders as |authProvider|}}
+          {{#each this.authProviders as |authProvider|}}
             {{#if authProvider.account}}
               <tr class="{{dasherize authProvider.method.name}} account-connected">
                 <td>{{authProvider.method.prettyName}}</td>
                 <td>{{authProvider.account.description}}</td>
                 <td>
                   {{#if authProvider.method.can_revoke}}
-                    <DButton @action={{action "revokeAccount"}} @actionParam={{authProvider.account}} @title="user.associated_accounts.revoke" @class="btn-danger no-text" @icon="trash-alt" @disabled={{get revoking authProvider.method.name}} />
+                    <DButton @action={{action "revokeAccount"}} @actionParam={{authProvider.account}} @title="user.associated_accounts.revoke" @class="btn-danger no-text" @icon="trash-alt" @disabled={{get this.revoking authProvider.method.name}} />
                   {{/if}}
                 </td>
               </tr>
@@ -111,7 +111,7 @@
                 <td>{{authProvider.method.prettyName}}</td>
                 <td colspan="2">
                   {{#if authProvider.method.can_connect}}
-                    <DButton @action={{action "connectAccount"}} @actionParam={{authProvider.method}} @label="user.associated_accounts.connect" @class="btn-default" @icon="plug" @disabled={{disableConnectButtons}} />
+                    <DButton @action={{action "connectAccount"}} @actionParam={{authProvider.method}} @label="user.associated_accounts.connect" @class="btn-default" @icon="plug" @disabled={{this.disableConnectButtons}} />
                   {{else}}
                     {{i18n "user.associated_accounts.not_connected"}}
                   {{/if}}
@@ -123,33 +123,33 @@
       </table>
     {{else}}
       <div class="controls">
-        <DButton @action={{route-action "checkEmail"}} @actionParam={{model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
+        <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @title="admin.users.check_email.title" @icon="far-envelope" @label="admin.users.check_email.text" />
       </div>
     {{/if}}
   </div>
 {{/if}}
 
-{{#if canEditName}}
+{{#if this.canEditName}}
   <div class="control-group pref-name">
     <label class="control-label">{{i18n "user.name.title"}}</label>
     <div class="controls">
-      {{#if model.can_edit_name}}
-        <TextField @value={{newNameInput}} @classNames="input-xxlarge" @maxlength="255" />
+      {{#if this.model.can_edit_name}}
+        <TextField @value={{this.newNameInput}} @classNames="input-xxlarge" @maxlength="255" />
       {{else}}
-        <span class="static">{{model.name}}</span>
+        <span class="static">{{this.model.name}}</span>
       {{/if}}
     </div>
     <div class="instructions">
-      {{nameInstructions}}
+      {{this.nameInstructions}}
     </div>
   </div>
 {{/if}}
 
-{{#if canSelectTitle}}
+{{#if this.canSelectTitle}}
   <div class="control-group pref-title">
     <label class="control-label">{{i18n "user.title.title"}}</label>
     <div class="controls">
-      <ComboBox @value={{newTitleInput}} @content={{model.availableTitles}} @onChange={{action (mut newTitleInput)}} @options={{hash
+      <ComboBox @value={{this.newTitleInput}} @content={{this.model.availableTitles}} @onChange={{action (mut this.newTitleInput)}} @options={{hash
           none="user.title.none"
         }} />
     </div>
@@ -159,11 +159,11 @@
   </div>
 {{/if}}
 
-{{#if canSelectFlair}}
+{{#if this.canSelectFlair}}
   <div class="control-group pref-flair">
     <label class="control-label">{{i18n "user.flair.title"}}</label>
     <div class="controls">
-      <FlairChooser @value={{newFlairGroupId}} @content={{model.availableFlairs}} @onChange={{action (mut newFlairGroupId)}} @options={{hash
+      <FlairChooser @value={{this.newFlairGroupId}} @content={{this.model.availableFlairs}} @onChange={{action (mut this.newFlairGroupId)}} @options={{hash
           none="user.flair.none"
         }} />
     </div>
@@ -173,32 +173,32 @@
   </div>
 {{/if}}
 
-{{#if canSelectPrimaryGroup}}
+{{#if this.canSelectPrimaryGroup}}
   <div class="control-group pref-primary-group">
     <label class="control-label">{{i18n "user.primary_group.title"}}</label>
     <div class="controls">
-      <ComboBox @value={{newPrimaryGroupInput}} @content={{model.filteredGroups}} @options={{hash
+      <ComboBox @value={{this.newPrimaryGroupInput}} @content={{this.model.filteredGroups}} @options={{hash
           none="user.primary_group.none"
         }} />
     </div>
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-preferences-account" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-account" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-{{#if canSaveUser}}
-  <SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+{{#if this.canSaveUser}}
+  <SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
 {{/if}}
 
-{{#if model.canDeleteAccount}}
+{{#if this.model.canDeleteAccount}}
   <div class="control-group delete-account">
     <br>
     <div class="controls">
-      <DButton @action={{action "delete"}} @disabled={{deleteDisabled}} @class="btn-danger" @icon="far-trash-alt" @label="user.delete_account" />
+      <DButton @action={{action "delete"}} @disabled={{this.deleteDisabled}} @class="btn-danger" @icon="far-trash-alt" @label="user.delete_account" />
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
index 6ab924598c1..56795452dc7 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/apps.hbs
@@ -1,8 +1,8 @@
-{{#if model.userApiKeys}}
+{{#if this.model.userApiKeys}}
   <div class="control-group apps">
     <label class="control-label">{{i18n "user.apps"}}</label>
     <div class="controls">
-      {{#each model.userApiKeys as |key|}}
+      {{#each this.model.userApiKeys as |key|}}
         <div>
           <span>{{key.application_name}}</span>
           {{#if key.revoked}}
@@ -25,4 +25,4 @@
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-preferences-apps" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-preferences-apps" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
index 855a0b2e8a9..ac28c0b2cec 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/categories.hbs
@@ -3,54 +3,54 @@
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching"}} {{i18n "user.watched_categories"}}</label>
-    {{#if canSee}}
-      <a class="show-tracking" href={{model.watchingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
+    {{#if this.canSee}}
+      <a class="show-tracking" href={{this.model.watchingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
-    <CategorySelector @categories={{model.watchedCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.watchedCategories)}} />
+    <CategorySelector @categories={{this.model.watchedCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.watchedCategories)}} />
   </div>
   <div class="instructions">{{i18n "user.watched_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>
-    {{#if canSee}}
-      <a class="show-tracking" href={{model.trackingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
+    {{#if this.canSee}}
+      <a class="show-tracking" href={{this.model.trackingTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
     {{/if}}
-    <CategorySelector @categories={{model.trackedCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.trackedCategories)}} />
+    <CategorySelector @categories={{this.model.trackedCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.trackedCategories)}} />
   </div>
   <div class="instructions">{{i18n "user.tracked_categories_instructions"}}</div>
 
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n "user.watched_first_post_categories"}}</label>
-    <CategorySelector @categories={{model.watchedFirstPostCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.watchedFirstPostCategories)}} />
+    <CategorySelector @categories={{this.model.watchedFirstPostCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.watchedFirstPostCategories)}} />
   </div>
   <div class="instructions">{{i18n "user.watched_first_post_categories_instructions"}}</div>
 
-  {{#if siteSettings.mute_all_categories_by_default}}
+  {{#if this.siteSettings.mute_all_categories_by_default}}
     <div class="controls tracking-controls">
       <label>{{d-icon "d-regular"}} {{i18n "user.regular_categories"}}</label>
-      <CategorySelector @categories={{model.regularCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.regularCategories)}} />
+      <CategorySelector @categories={{this.model.regularCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.regularCategories)}} />
     </div>
     <div class="instructions">{{i18n "user.regular_categories_instructions"}}</div>
   {{else}}
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted"}} {{i18n "user.muted_categories"}}</label>
-      {{#if canSee}}
-        <a class="show-tracking" href={{model.mutedTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
+      {{#if this.canSee}}
+        <a class="show-tracking" href={{this.model.mutedTopicsPath}}>{{i18n "user.tracked_topics_link"}}</a>
       {{/if}}
-      <CategorySelector @categories={{model.mutedCategories}} @blockedCategories={{selectedCategories}} @onChange={{action (mut model.mutedCategories)}} />
+      <CategorySelector @categories={{this.model.mutedCategories}} @blockedCategories={{this.selectedCategories}} @onChange={{action (mut this.model.mutedCategories)}} />
     </div>
-    <div class="instructions">{{i18n (if hideMutedTags "user.muted_categories_instructions" "user.muted_categories_instructions_dont_hide")}}</div>
+    <div class="instructions">{{i18n (if this.hideMutedTags "user.muted_categories_instructions" "user.muted_categories_instructions_dont_hide")}}</div>
   {{/if}}
 </div>
 
-<PluginOutlet @name="user-preferences-categories" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-categories" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-{{#if canSave}}
-  <SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+{{#if this.canSave}}
+  <SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
 {{else}}
   {{i18n "user.no_category_access"}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
index 0d7bcb6d901..eef6c57120c 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/emails.hbs
@@ -1,5 +1,5 @@
-{{#unless siteSettings.disable_mailing_list_mode}}
-  {{~#if model.user_option.mailing_list_mode}}
+{{#unless this.siteSettings.disable_mailing_list_mode}}
+  {{~#if this.model.user_option.mailing_list_mode}}
     <div class="warning-wrap">
       <div class="warning">{{i18n "user.mailing_list_mode.warning"}}</div>
     </div>
@@ -10,61 +10,61 @@
 
   <div class="controls controls-dropdown">
     <label for="user-email-messages-level">{{i18n "user.email_messages_level"}}</label>
-    <ComboBox @valueProperty="value" @content={{emailLevelOptions}} @value={{model.user_option.email_messages_level}} @id="user-email-messages-level" @onChange={{action (mut model.user_option.email_messages_level)}} />
-    {{#if emailMessagesLevelAway}}
-      <div class="instructions">{{emailFrequencyInstructions}}</div>
+    <ComboBox @valueProperty="value" @content={{this.emailLevelOptions}} @value={{this.model.user_option.email_messages_level}} @id="user-email-messages-level" @onChange={{action (mut this.model.user_option.email_messages_level)}} />
+    {{#if this.emailMessagesLevelAway}}
+      <div class="instructions">{{this.emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
   <div class="controls controls-dropdown">
     <label for="user-email-level">{{i18n "user.email_level.title"}}</label>
-    <ComboBox @valueProperty="value" @content={{emailLevelOptions}} @value={{model.user_option.email_level}} @id="user-email-level" @onChange={{action (mut model.user_option.email_level)}} />
-    {{#if emailLevelAway}}
-      <div class="instructions">{{emailFrequencyInstructions}}</div>
+    <ComboBox @valueProperty="value" @content={{this.emailLevelOptions}} @value={{this.model.user_option.email_level}} @id="user-email-level" @onChange={{action (mut this.model.user_option.email_level)}} />
+    {{#if this.emailLevelAway}}
+      <div class="instructions">{{this.emailFrequencyInstructions}}</div>
     {{/if}}
   </div>
 
   <div class="controls controls-dropdown">
     <label>{{i18n "user.email_previous_replies.title"}}</label>
-    <ComboBox @valueProperty="value" @content={{previousRepliesOptions}} @value={{model.user_option.email_previous_replies}} @onChange={{action (mut model.user_option.email_previous_replies)}} />
+    <ComboBox @valueProperty="value" @content={{this.previousRepliesOptions}} @value={{this.model.user_option.email_previous_replies}} @onChange={{action (mut this.model.user_option.email_previous_replies)}} />
   </div>
-  <PreferenceCheckbox @labelKey="user.email_in_reply_to" @checked={{model.user_option.email_in_reply_to}} />
+  <PreferenceCheckbox @labelKey="user.email_in_reply_to" @checked={{this.model.user_option.email_in_reply_to}} />
 
-  <PluginOutlet @name="user-preferences-emails-pref-email-settings" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+  <PluginOutlet @name="user-preferences-emails-pref-email-settings" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 </div>
 
-{{#unless siteSettings.disable_digest_emails}}
+{{#unless this.siteSettings.disable_digest_emails}}
   <div class="control-group pref-activity-summary">
     <label class="control-label">{{i18n "user.email_activity_summary"}}</label>
-    <PreferenceCheckbox @labelKey="user.email_digests.title" @disabled={{model.user_option.mailing_list_mode}} @checked={{model.user_option.email_digests}} />
-    {{#if model.user_option.email_digests}}
+    <PreferenceCheckbox @labelKey="user.email_digests.title" @disabled={{this.model.user_option.mailing_list_mode}} @checked={{this.model.user_option.email_digests}} />
+    {{#if this.model.user_option.email_digests}}
       <div class="controls controls-dropdown">
-        <ComboBox @valueProperty="value" @content={{digestFrequencies}} @value={{model.user_option.digest_after_minutes}} @onChange={{action (mut model.user_option.digest_after_minutes)}} @options={{hash
+        <ComboBox @valueProperty="value" @content={{this.digestFrequencies}} @value={{this.model.user_option.digest_after_minutes}} @onChange={{action (mut this.model.user_option.digest_after_minutes)}} @options={{hash
             filterable=true
           }} />
       </div>
-      <PreferenceCheckbox @labelKey="user.include_tl0_in_digests" @disabled={{model.user_option.mailing_list_mode}} @checked={{model.user_option.include_tl0_in_digests}} />
+      <PreferenceCheckbox @labelKey="user.include_tl0_in_digests" @disabled={{this.model.user_option.mailing_list_mode}} @checked={{this.model.user_option.include_tl0_in_digests}} />
     {{/if}}
   </div>
 {{/unless}}
 
-{{#unless siteSettings.disable_mailing_list_mode}}
+{{#unless this.siteSettings.disable_mailing_list_mode}}
   <div class="control-group pref-mailing-list-mode">
     <label class="control-label">{{i18n "user.mailing_list_mode.label"}}</label>
-    <PreferenceCheckbox @labelKey="user.mailing_list_mode.enabled" @checked={{model.user_option.mailing_list_mode}} />
+    <PreferenceCheckbox @labelKey="user.mailing_list_mode.enabled" @checked={{this.model.user_option.mailing_list_mode}} />
     <div class="instructions">{{html-safe (i18n "user.mailing_list_mode.instructions")}}</div>
-    {{#if model.user_option.mailing_list_mode}}
+    {{#if this.model.user_option.mailing_list_mode}}
       <div class="controls controls-dropdown">
-        <ComboBox @valueProperty="value" @content={{mailingListModeOptions}} @value={{model.user_option.mailing_list_mode_frequency}} @onChange={{action (mut model.user_option.mailing_list_mode_frequency)}} />
+        <ComboBox @valueProperty="value" @content={{this.mailingListModeOptions}} @value={{this.model.user_option.mailing_list_mode_frequency}} @onChange={{action (mut this.model.user_option.mailing_list_mode_frequency)}} />
       </div>
     {{/if}}
   </div>
 {{/unless}}
 
-<PluginOutlet @name="user-preferences-emails" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-emails" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
index 87b60d295ee..9187cf88dec 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/interface.hbs
@@ -1,41 +1,41 @@
-<PluginOutlet @name="user-preferences-interface-top" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-interface-top" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
-{{#if showThemeSelector}}
+{{#if this.showThemeSelector}}
   <div class="control-group theme">
     <label class="control-label">{{i18n "user.theme"}}</label>
     <div class="controls">
-      <ComboBox @content={{userSelectableThemes}} @value={{themeId}} />
+      <ComboBox @content={{this.userSelectableThemes}} @value={{this.themeId}} />
     </div>
-    {{#if themeIdChanged}}
+    {{#if this.themeIdChanged}}
       <p class="alert alert-success save-theme-alert">{{i18n "user.save_to_change_theme" save_text=(i18n "save") }}</p>
     {{/if}}
-    {{#if showThemeSetDefault}}
+    {{#if this.showThemeSetDefault}}
       <div class="controls">
-        <PreferenceCheckbox @labelKey="user.theme_default_on_all_devices" @checked={{makeThemeDefault}} />
+        <PreferenceCheckbox @labelKey="user.theme_default_on_all_devices" @checked={{this.makeThemeDefault}} />
       </div>
     {{/if}}
   </div>
 {{/if}}
 
-{{#if showColorSchemeSelector}}
+{{#if this.showColorSchemeSelector}}
   <fieldset class="control-group color-scheme">
     <legend class="control-label">{{i18n "user.color_scheme"}}</legend>
     <div class="control-subgroup light-color-scheme">
-      {{#if showDarkColorSchemeSelector}}
+      {{#if this.showDarkColorSchemeSelector}}
         <div class="instructions">{{i18n "user.color_schemes.regular" }}</div>
       {{/if}}
       <div class="controls">
-        <ComboBox @content={{userSelectableColorSchemes}} @value={{selectedColorSchemeId}} @onChange={{action "loadColorScheme"}} @options={{hash
-            translatedNone=selectedColorSchemeNoneLabel
-            autoInsertNoneItem=showColorSchemeNoneItem
+        <ComboBox @content={{this.userSelectableColorSchemes}} @value={{this.selectedColorSchemeId}} @onChange={{action "loadColorScheme"}} @options={{hash
+            translatedNone=this.selectedColorSchemeNoneLabel
+            autoInsertNoneItem=this.showColorSchemeNoneItem
           }} />
       </div>
     </div>
-    {{#if showDarkColorSchemeSelector}}
+    {{#if this.showDarkColorSchemeSelector}}
       <div class="control-subgroup dark-color-scheme">
         <div class="instructions">{{i18n "user.color_schemes.dark" }}</div>
         <div class="controls">
-          <ComboBox @content={{userSelectableDarkColorSchemes}} @value={{selectedDarkColorSchemeId}} @onChange={{action "loadDarkColorScheme"}} />
+          <ComboBox @content={{this.userSelectableDarkColorSchemes}} @value={{this.selectedDarkColorSchemeId}} @onChange={{action "loadDarkColorScheme"}} />
         </div>
       </div>
 
@@ -44,23 +44,23 @@
       </div>
     {{/if}}
 
-    {{#if previewingColorScheme}}
-      {{#if previewingColorScheme}}
+    {{#if this.previewingColorScheme}}
+      {{#if this.previewingColorScheme}}
         <DButton @action={{action "undoColorSchemePreview"}} @label="user.color_schemes.undo" @icon="undo" @class="btn-default btn-small undo-preview" />
       {{/if}}
 
       <div class="controls color-scheme-checkbox">
-        <PreferenceCheckbox @labelKey="user.color_scheme_default_on_all_devices" @checked={{makeColorSchemeDefault}} />
+        <PreferenceCheckbox @labelKey="user.color_scheme_default_on_all_devices" @checked={{this.makeColorSchemeDefault}} />
       </div>
     {{/if}}
   </fieldset>
 {{/if}}
 
-{{#if showDarkModeToggle}}
+{{#if this.showDarkModeToggle}}
   <div class="control-group dark-mode">
     <label class="control-label">{{i18n "user.dark_mode"}}</label>
     <div class="controls">
-      <PreferenceCheckbox @labelKey="user.dark_mode_enable" @checked={{enableDarkMode}} />
+      <PreferenceCheckbox @labelKey="user.dark_mode_enable" @checked={{this.enableDarkMode}} />
     </div>
   </div>
 {{/if}}
@@ -68,20 +68,20 @@
 <div class="control-group text-size">
   <label for="text-size-selector" class="control-label">{{i18n "user.text_size.title"}}</label>
   <div class="controls">
-    <ComboBox @id="text-size-selector" @valueProperty="value" @content={{textSizes}} @value={{textSize}} @onChange={{action "selectTextSize"}} />
+    <ComboBox @id="text-size-selector" @valueProperty="value" @content={{this.textSizes}} @value={{this.textSize}} @onChange={{action "selectTextSize"}} />
   </div>
-  {{#if showTextSetDefault}}
+  {{#if this.showTextSetDefault}}
     <div class="controls">
-      <PreferenceCheckbox @labelKey="user.text_size_default_on_all_devices" @checked={{makeTextSizeDefault}} />
+      <PreferenceCheckbox @labelKey="user.text_size_default_on_all_devices" @checked={{this.makeTextSizeDefault}} />
     </div>
   {{/if}}
 </div>
 
-{{#if siteSettings.allow_user_locale}}
+{{#if this.siteSettings.allow_user_locale}}
   <div class="control-group pref-locale">
     <label for="locale-selector" class="control-label">{{i18n "user.locale.title"}}</label>
     <div class="controls">
-      <ComboBox @id="locale-selector" @valueProperty="value" @langProperty="value" @content={{availableLocales}} @value={{model.locale}} @onChange={{action (mut model.locale)}} @options={{hash
+      <ComboBox @id="locale-selector" @valueProperty="value" @langProperty="value" @content={{this.availableLocales}} @value={{this.model.locale}} @onChange={{action (mut this.model.locale)}} @options={{hash
           filterable=true
           none="user.locale.default"
         }} />
@@ -95,34 +95,34 @@
 <div class="control-group home">
   <label for="home-selector" class="control-label">{{i18n "user.home"}}</label>
   <div class="controls">
-    <ComboBox @id="home-selector" @content={{userSelectableHome}} @valueProperty="value" @value={{homepageId}} @onChange={{action (mut model.user_option.homepage_id)}} />
+    <ComboBox @id="home-selector" @content={{this.userSelectableHome}} @valueProperty="value" @value={{this.homepageId}} @onChange={{action (mut this.model.user_option.homepage_id)}} />
   </div>
 </div>
 
 <fieldset class="control-group other">
   <legend class="control-label">{{i18n "user.other_settings"}}</legend>
 
-  <PreferenceCheckbox @labelKey="user.external_links_in_new_tab" @checked={{model.user_option.external_links_in_new_tab}} @class="pref-external-links" />
-  <PreferenceCheckbox @labelKey="user.enable_quoting" @checked={{model.user_option.enable_quoting}} @class="pref-enable-quoting" />
-  <PreferenceCheckbox @labelKey="user.enable_defer" @checked={{model.user_option.enable_defer}} @class="pref-defer-unread" />
-  {{#if siteSettings.automatically_unpin_topics}}
-    <PreferenceCheckbox @labelKey="user.automatically_unpin_topics" @checked={{model.user_option.automatically_unpin_topics}} @class="pref-auto-unpin" />
+  <PreferenceCheckbox @labelKey="user.external_links_in_new_tab" @checked={{this.model.user_option.external_links_in_new_tab}} @class="pref-external-links" />
+  <PreferenceCheckbox @labelKey="user.enable_quoting" @checked={{this.model.user_option.enable_quoting}} @class="pref-enable-quoting" />
+  <PreferenceCheckbox @labelKey="user.enable_defer" @checked={{this.model.user_option.enable_defer}} @class="pref-defer-unread" />
+  {{#if this.siteSettings.automatically_unpin_topics}}
+    <PreferenceCheckbox @labelKey="user.automatically_unpin_topics" @checked={{this.model.user_option.automatically_unpin_topics}} @class="pref-auto-unpin" />
   {{/if}}
-  {{#if siteSettings.allow_users_to_hide_profile}}
-    <PreferenceCheckbox @labelKey="user.hide_profile_and_presence" @checked={{model.user_option.hide_profile_and_presence}} @class="pref-hide-profile" />
+  {{#if this.siteSettings.allow_users_to_hide_profile}}
+    <PreferenceCheckbox @labelKey="user.hide_profile_and_presence" @checked={{this.model.user_option.hide_profile_and_presence}} @class="pref-hide-profile" />
   {{/if}}
-  <PreferenceCheckbox @labelKey="user.dynamic_favicon" @checked={{model.user_option.dynamic_favicon}} @class="pref-dynamic-favicon" />
+  <PreferenceCheckbox @labelKey="user.dynamic_favicon" @checked={{this.model.user_option.dynamic_favicon}} @class="pref-dynamic-favicon" />
   <div class="controls controls-dropdown pref-page-title">
     <label for="user-title-count-mode">{{i18n "user.title_count_mode.title"}}</label>
-    <ComboBox @valueProperty="value" @content={{titleCountModes}} @value={{model.user_option.title_count_mode}} @id="user-title-count-mode" @onChange={{action (mut model.user_option.title_count_mode)}} />
+    <ComboBox @valueProperty="value" @content={{this.titleCountModes}} @value={{this.model.user_option.title_count_mode}} @id="user-title-count-mode" @onChange={{action (mut this.model.user_option.title_count_mode)}} />
   </div>
-  <PreferenceCheckbox @labelKey="user.skip_new_user_tips.description" @checked={{model.user_option.skip_new_user_tips}} @class="pref-new-user-tips" />
+  <PreferenceCheckbox @labelKey="user.skip_new_user_tips.description" @checked={{this.model.user_option.skip_new_user_tips}} @class="pref-new-user-tips" />
 </fieldset>
 
-<PluginOutlet @name="user-preferences-interface" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-interface" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
index 63d7be97ad7..3d1f882f904 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/notifications.hbs
@@ -3,50 +3,50 @@
 
   <div class="controls controls-dropdown">
     <label>{{i18n "user.new_topic_duration.label"}}</label>
-    <ComboBox @class="duration" @valueProperty="value" @content={{considerNewTopicOptions}} @value={{model.user_option.new_topic_duration_minutes}} @onChange={{action (mut model.user_option.new_topic_duration_minutes)}} />
+    <ComboBox @class="duration" @valueProperty="value" @content={{this.considerNewTopicOptions}} @value={{this.model.user_option.new_topic_duration_minutes}} @onChange={{action (mut this.model.user_option.new_topic_duration_minutes)}} />
   </div>
 
   <div class="controls controls-dropdown">
     <label>{{i18n "user.auto_track_topics"}}</label>
-    <ComboBox @valueProperty="value" @content={{autoTrackDurations}} @value={{model.user_option.auto_track_topics_after_msecs}} @onChange={{action (mut model.user_option.auto_track_topics_after_msecs)}} />
+    <ComboBox @valueProperty="value" @content={{this.autoTrackDurations}} @value={{this.model.user_option.auto_track_topics_after_msecs}} @onChange={{action (mut this.model.user_option.auto_track_topics_after_msecs)}} />
   </div>
 
   <div class="controls controls-dropdown">
     <label>{{i18n "user.notification_level_when_replying"}}</label>
-    <ComboBox @valueProperty="value" @content={{notificationLevelsForReplying}} @value={{model.user_option.notification_level_when_replying}} @onChange={{action (mut model.user_option.notification_level_when_replying)}} />
+    <ComboBox @valueProperty="value" @content={{this.notificationLevelsForReplying}} @value={{this.model.user_option.notification_level_when_replying}} @onChange={{action (mut this.model.user_option.notification_level_when_replying)}} />
   </div>
 
   <div class="controls controls-dropdown">
     <label>{{i18n "user.like_notification_frequency.title"}}</label>
-    <ComboBox @valueProperty="value" @content={{likeNotificationFrequencies}} @value={{model.user_option.like_notification_frequency}} @onChange={{action (mut model.user_option.like_notification_frequency)}} />
+    <ComboBox @valueProperty="value" @content={{this.likeNotificationFrequencies}} @value={{this.model.user_option.like_notification_frequency}} @onChange={{action (mut this.model.user_option.like_notification_frequency)}} />
   </div>
 </div>
 
-{{#unless capabilities.isIOS}}
+{{#unless this.capabilities.isIOS}}
   <div class="control-group desktop-notifications">
     <label class="control-label">{{i18n "user.desktop_notifications.label"}}</label>
     <DesktopNotificationConfig />
     <div class="instructions">{{i18n "user.desktop_notifications.each_browser_note"}}</div>
-    <PluginOutlet @name="user-preferences-desktop-notifications" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+    <PluginOutlet @name="user-preferences-desktop-notifications" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
   </div>
 {{/unless}}
 
-<UserNotificationSchedule @model={{model}} />
+<UserNotificationSchedule @model={{this.model}} />
 
-{{#if siteSettings.enable_personal_messages}}
+{{#if this.siteSettings.enable_personal_messages}}
   <div class="control-group private-messages">
     <label class="control-label">{{i18n "user.private_messages"}}</label>
 
     <div class="controls">
-      <PreferenceCheckbox @labelKey="user.allow_private_messages" @checked={{model.user_option.allow_private_messages}} />
+      <PreferenceCheckbox @labelKey="user.allow_private_messages" @checked={{this.model.user_option.allow_private_messages}} />
     </div>
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-preferences-notifications" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-notifications" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
index 31384e6400c..c2610f66832 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/profile.hbs
@@ -1,60 +1,60 @@
-{{#if canChangeBio}}
+{{#if this.canChangeBio}}
   <div class="control-group pref-bio">
     <label class="control-label">{{i18n "user.bio"}}</label>
     <div class="controls bio-composer input-xxlarge">
-      <DEditor @value={{model.bio_raw}} />
+      <DEditor @value={{this.model.bio_raw}} />
     </div>
   </div>
 {{/if}}
 
 <div class="control-group pref-timezone">
   <label class="control-label">{{i18n "user.timezone"}}</label>
-  <TimezoneInput @value={{model.user_option.timezone}} @onChange={{action (mut model.user_option.timezone)}} @class="input-xxlarge" />
+  <TimezoneInput @value={{this.model.user_option.timezone}} @onChange={{action (mut this.model.user_option.timezone)}} @class="input-xxlarge" />
   <DButton @class="btn-default" @icon="globe" @label="user.use_current_timezone" @action={{action "useCurrentTimezone"}} />
 </div>
 
-{{#if model.can_change_location}}
+{{#if this.model.can_change_location}}
   <div class="control-group pref-location">
     <label class="control-label">{{i18n "user.location"}}</label>
     <div class="controls">
-      <Input @type="text" @value={{model.location}} class="input-xxlarge" @id="edit-location" />
+      <Input @type="text" @value={{this.model.location}} class="input-xxlarge" @id="edit-location" />
     </div>
   </div>
 {{/if}}
 
-{{#if model.can_change_website}}
+{{#if this.model.can_change_website}}
   <div class="control-group pref-website">
     <label class="control-label">{{i18n "user.website"}}</label>
     <div class="controls">
-      <Input @type="text" @value={{model.website}} class="input-xxlarge" />
+      <Input @type="text" @value={{this.model.website}} class="input-xxlarge" />
     </div>
   </div>
 {{/if}}
 
-{{#each userFields as |uf|}}
+{{#each this.userFields as |uf|}}
   <div class="control-group">
     <UserField @field={{uf.field}} @value={{uf.value}} />
   </div>
 {{/each}}
 <div class="clearfix"></div>
 
-{{#if siteSettings.allow_profile_backgrounds}}
-  {{#if canUploadProfileHeader}}
+{{#if this.siteSettings.allow_profile_backgrounds}}
+  {{#if this.canUploadProfileHeader}}
     <div class="control-group pref-profile-bg">
       <label class="control-label">{{i18n "user.change_profile_background.title"}}</label>
       <div class="controls">
-        <UppyImageUploader @imageUrl={{model.profile_background_upload_url}} @type="profile_background" @id="profile-background-uploader" />
+        <UppyImageUploader @imageUrl={{this.model.profile_background_upload_url}} @type="profile_background" @id="profile-background-uploader" />
       </div>
       <div class="instructions">
         {{i18n "user.change_profile_background.instructions"}}
       </div>
     </div>
   {{/if}}
-  {{#if canUploadUserCardBackground}}
+  {{#if this.canUploadUserCardBackground}}
     <div class="control-group pref-profile-bg">
       <label class="control-label">{{i18n "user.change_card_background.title"}}</label>
       <div class="controls">
-        <UppyImageUploader @imageUrl={{model.card_background_upload_url}} @type="card_background" @id="profile-card-background-uploader" />
+        <UppyImageUploader @imageUrl={{this.model.card_background_upload_url}} @type="card_background" @id="profile-card-background-uploader" />
       </div>
       <div class="instructions">
         {{i18n "user.change_card_background.instructions"}}
@@ -63,20 +63,20 @@
   {{/if}}
 {{/if}}
 
-{{#if siteSettings.allow_featured_topic_on_user_profiles}}
+{{#if this.siteSettings.allow_featured_topic_on_user_profiles}}
   <div class="control-group">
     <label class="control-label">{{i18n "user.featured_topic"}}</label>
-    {{#if model.featured_topic}}
+    {{#if this.model.featured_topic}}
       <label class="featured-topic-link">
-        <LinkTo @route="topic" @models={{array model.featured_topic.slug model.featured_topic.id}}>
-          {{html-safe (replace-emoji model.featured_topic.fancy_title)}}
+        <LinkTo @route="topic" @models={{array this.model.featured_topic.slug this.model.featured_topic.id}}>
+          {{html-safe (replace-emoji this.model.featured_topic.fancy_title)}}
         </LinkTo>
       </label>
     {{/if}}
 
     <div>
       <DButton @action={{action "showFeaturedTopicModal"}} @class="btn-default feature-topic-on-profile-btn" @label="user.feature_topic_on_profile.open_search" />
-      {{#if model.featured_topic}}
+      {{#if this.model.featured_topic}}
         <DButton @action={{action "clearFeaturedTopicFromProfile"}} @class="btn-danger clear-feature-topic-on-profile-btn" @label="user.feature_topic_on_profile.clear.title" />
       {{/if}}
     </div>
@@ -86,11 +86,11 @@
   </div>
 {{/if}}
 
-{{#if canChangeDefaultCalendar }}
+{{#if this.canChangeDefaultCalendar }}
   <div class="control-group">
     <label class="control-label">{{i18n "download_calendar.default_calendar"}}</label>
     <div>
-      <ComboBox @valueProperty="value" @content={{calendarOptions}} @value={{model.user_option.default_calendar}} @id="user-default-calendar" @onChange={{action (mut model.user_option.default_calendar)}} />
+      <ComboBox @valueProperty="value" @content={{this.calendarOptions}} @value={{this.model.user_option.default_calendar}} @id="user-default-calendar" @onChange={{action (mut this.model.user_option.default_calendar)}} />
     </div>
     <div class="instructions">
       {{i18n "download_calendar.default_calendar_instruction"}}
@@ -98,12 +98,12 @@
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-preferences-profile" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-profile" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
-<PluginOutlet @name="user-custom-preferences" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-preferences" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
index af4f412e717..76e2d3f63a0 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/security.hbs
@@ -1,29 +1,29 @@
-{{#if canChangePassword}}
+{{#if this.canChangePassword}}
   <div class="control-group pref-password">
     <label class="control-label">{{i18n "user.password.title"}}</label>
     <div class="controls">
       <a href {{action "changePassword"}} class="btn btn-default">
         {{d-icon "envelope"}}
-        {{#if model.no_password}}
+        {{#if this.model.no_password}}
           {{i18n "user.change_password.set_password"}}
         {{else}}
           {{i18n "user.change_password.action"}}
         {{/if}}
       </a>
 
-      {{passwordProgress}}
+      {{this.passwordProgress}}
     </div>
   </div>
 
   <div class="control-group pref-second-factor">
     <label class="control-label">{{i18n "user.second_factor.title"}}</label>
-    {{#unless model.second_factor_enabled}}
+    {{#unless this.model.second_factor_enabled}}
       <label>
         {{i18n "user.second_factor.short_description"}}
       </label>
     {{/unless}}
     <div class="controls pref-second-factor">
-      {{#if isCurrentUser}}
+      {{#if this.isCurrentUser}}
         <LinkTo @route="preferences.second-factor" class="btn btn-default">
           {{d-icon "lock"}} <span>{{i18n "user.second_factor.enable"}}</span>
         </LinkTo>
@@ -32,12 +32,12 @@
   </div>
 {{/if}}
 
-{{#if canCheckEmails}}
+{{#if this.canCheckEmails}}
   <div class="control-group pref-auth-tokens">
     <label class="control-label">{{i18n "user.auth_tokens.title"}}</label>
 
     <div class="auth-tokens">
-      {{#each authTokens as |token|}}
+      {{#each this.authTokens as |token|}}
         <div class="row auth-token">
           <div class="auth-token-icon">{{d-icon token.icon}}</div>
           {{#unless token.is_active}}
@@ -57,12 +57,12 @@
       {{/each}}
     </div>
 
-    {{#if canShowAllAuthTokens}}
+    {{#if this.canShowAllAuthTokens}}
       <a href {{action "toggleShowAllAuthTokens"}}>
-        {{#if showAllAuthTokens}}
+        {{#if this.showAllAuthTokens}}
           {{d-icon "caret-up"}} {{i18n "user.auth_tokens.show_few"}}
         {{else}}
-          {{d-icon "caret-down"}} {{i18n "user.auth_tokens.show_all" count=model.user_auth_tokens.length}}
+          {{d-icon "caret-down"}} {{i18n "user.auth_tokens.show_all" count=this.model.user_auth_tokens.length}}
         {{/if}}
       </a>
     {{/if}}
@@ -71,8 +71,8 @@
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-preferences-security" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+<PluginOutlet @name="user-preferences-security" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
 <br>
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
index 555c0b2518d..cd9a198cfe7 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/sidebar.hbs
@@ -2,12 +2,12 @@
   <legend class="control-label">{{i18n "user.experimental_sidebar.options"}}</legend>
 
   <PreferenceCheckbox
-      @labelKey="user.experimental_sidebar.enable"
-      @checked={{model.user_option.enable_experimental_sidebar}}
-      @class="preferences-sidebar-enable-checkbox" />
+    @labelKey="user.experimental_sidebar.enable"
+    @checked={{this.model.user_option.enable_experimental_sidebar}}
+    @class="preferences-sidebar-enable-checkbox" />
 </div>
 
-{{#if model.experimental_sidebar_enabled}}
+{{#if this.model.experimental_sidebar_enabled}}
   <div class="control-group preferences-sidebar-categories">
     <legend class="control-label">{{i18n "user.experimental_sidebar.categories_section"}}</legend>
 
@@ -46,4 +46,4 @@
   {{/if}}
 {{/if}}
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs b/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
index 6d4138f5ac5..6ef089fc766 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
@@ -1,10 +1,10 @@
-{{#if siteSettings.tagging_enabled}}
+{{#if this.siteSettings.tagging_enabled}}
   <div class="control-group tag-notifications">
     <label class="control-label">{{i18n "user.tag_settings"}}</label>
 
     <div class="controls tracking-controls">
       <label>{{d-icon "d-watching" class="icon watching"}} {{i18n "user.watched_tags"}}</label>
-      <TagChooser @tags={{model.watched_tags}} @blockedTags={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+      <TagChooser @tags={{this.model.watched_tags}} @blockedTags={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
           allowAny=false
         }} />
     </div>
@@ -13,7 +13,7 @@
 
     <div class="controls tracking-controls">
       <label>{{d-icon "d-tracking" class="icon tracking"}} {{i18n "user.tracked_tags"}}</label>
-      <TagChooser @tags={{model.tracked_tags}} @blockedTags={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+      <TagChooser @tags={{this.model.tracked_tags}} @blockedTags={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
           allowAny=false
         }} />
     </div>
@@ -22,7 +22,7 @@
 
     <div class="controls tracking-controls">
       <label>{{d-icon "d-watching-first" class="icon watching-first-post"}} {{i18n "user.watched_first_post_tags"}}</label>
-      <TagChooser @tags={{model.watching_first_post_tags}} @blockedTags={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+      <TagChooser @tags={{this.model.watching_first_post_tags}} @blockedTags={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
           allowAny=false
         }} />
     </div>
@@ -33,18 +33,18 @@
 
     <div class="controls tracking-controls">
       <label>{{d-icon "d-muted" class="icon muted"}} {{i18n "user.muted_tags"}}</label>
-      <TagChooser @tags={{model.muted_tags}} @blockedTags={{selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
+      <TagChooser @tags={{this.model.muted_tags}} @blockedTags={{this.selectedTags}} @everyTag={{true}} @unlimitedTagCount={{true}} @options={{hash
           allowAny=false
         }} />
     </div>
     <div class="instructions">{{i18n "user.muted_tags_instructions"}}</div>
   </div>
 
-  <PluginOutlet @name="user-preferences-tags" @tagName="span" @connectorTagName="div" @args={{hash model=model save=(action "save")}} />
+  <PluginOutlet @name="user-preferences-tags" @tagName="span" @connectorTagName="div" @args={{hash model=this.model save=(action "save")}} />
 
   <br>
 
-  <PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+  <PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-  <SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}} />
+  <SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
index ed0acfafedd..ebf6b46a744 100644
--- a/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/preferences/users.hbs
@@ -1,9 +1,9 @@
 <label class="control-label">{{i18n "user.users"}}</label>
-{{#if ignoredEnabled}}
+{{#if this.ignoredEnabled}}
   <div class="control-group user-ignore">
     <div class="controls tracking-controls user-notifications">
       <label>{{d-icon "far-eye-slash" class="icon"}} {{i18n "user.ignored_users"}}</label>
-      <IgnoredUserList @model={{model}} @items={{model.ignored_usernames}} @saving={{saved}} />
+      <IgnoredUserList @model={{this.model}} @items={{this.model.ignored_usernames}} @saving={{this.saved}} />
     </div>
   </div>
 {{/if}}
@@ -14,21 +14,21 @@
       {{d-icon "d-muted" class="icon"}}
       <span>{{i18n "user.muted_users"}}</span>
     </label>
-    <UserChooser @value={{mutedUsernames}} @onChange={{action "onChangeMutedUsernames"}} @options={{hash
+    <UserChooser @value={{this.mutedUsernames}} @onChange={{action "onChangeMutedUsernames"}} @options={{hash
         excludeCurrentUser=true
       }} />
   </div>
   <div class="instructions">{{i18n "user.muted_users_instructions"}}</div>
 </div>
 
-{{#if siteSettings.enable_personal_messages}}
+{{#if this.siteSettings.enable_personal_messages}}
   <div class="control-group user-allow-pm">
     <div class="controls">
-      <PreferenceCheckbox @labelKey="user.allow_private_messages_from_specific_users" @checked={{model.user_option.enable_allowed_pm_users}} @disabled={{disableAllowPmUsersSetting}} />
+      <PreferenceCheckbox @labelKey="user.allow_private_messages_from_specific_users" @checked={{this.model.user_option.enable_allowed_pm_users}} @disabled={{this.disableAllowPmUsersSetting}} />
     </div>
-    {{#if allowPmUsersEnabled}}
+    {{#if this.allowPmUsersEnabled}}
       <div class="controls tracking-controls">
-        <UserChooser @value={{allowedPmUsernames}} @onChange={{action "onChangeAllowedPmUsernames"}} @options={{hash
+        <UserChooser @value={{this.allowedPmUsernames}} @onChange={{action "onChangeAllowedPmUsernames"}} @options={{hash
             excludeCurrentUser=true
           }} />
       </div>
@@ -37,6 +37,6 @@
   </div>
 {{/if}}
 
-<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="user-custom-controls" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-<SaveControls @model={{model}} @action={{action "save"}} @saved={{saved}}></SaveControls>
+<SaveControls @model={{this.model}} @action={{action "save"}} @saved={{this.saved}}></SaveControls>
diff --git a/app/assets/javascripts/discourse/app/templates/review-index.hbs b/app/assets/javascripts/discourse/app/templates/review-index.hbs
index 2ddee875b09..efc79ea21b9 100644
--- a/app/assets/javascripts/discourse/app/templates/review-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-index.hbs
@@ -1,14 +1,14 @@
 <div class="reviewable-container">
   <div class="reviewable-list">
-    {{#if reviewables}}
+    {{#if this.reviewables}}
       <LoadMore @selector=".reviewable-item" @action={{action "loadMore"}}>
         <div class="reviewables">
-          {{#each reviewables as |r|}}
+          {{#each this.reviewables as |r|}}
             <ReviewableItem @reviewable={{r}} @remove={{action "remove"}} />
           {{/each}}
         </div>
       </LoadMore>
-      <ConditionalLoadingSpinner @condition={{reviewables.loadingMore}} />
+      <ConditionalLoadingSpinner @condition={{this.reviewables.loadingMore}} />
     {{else}}
       <div class="no-review">
         {{i18n "review.none"}}
@@ -19,35 +19,35 @@
   <div class="reviewable-filters">
     <div class="reviewable-filter">
       <label class="filter-label">{{i18n "review.filters.status"}}</label>
-      <ComboBox @value={{filterStatus}} @content={{statuses}} @onChange={{action (mut filterStatus)}} />
+      <ComboBox @value={{this.filterStatus}} @content={{this.statuses}} @onChange={{action (mut this.filterStatus)}} />
     </div>
 
-    {{#if filtersExpanded}}
+    {{#if this.filtersExpanded}}
 
-      <PluginOutlet @name="above-review-filters" @tagName="span" @connectorTagName="div" @args={{hash model=model additionalFilters=additionalFilters}} />
+      <PluginOutlet @name="above-review-filters" @tagName="span" @connectorTagName="div" @args={{hash model=this.model additionalFilters=this.additionalFilters}} />
 
       <div class="reviewable-filter">
         <label class="filter-label">{{i18n "review.filters.type.title"}}</label>
-        <ComboBox @value={{filterType}} @content={{allTypes}} @onChange={{action (mut filterType)}} @options={{hash
+        <ComboBox @value={{this.filterType}} @content={{this.allTypes}} @onChange={{action (mut this.filterType)}} @options={{hash
             none="review.filters.type.all"
           }} />
       </div>
 
       <div class="reviewable-filter">
         <label class="filter-label">{{i18n "review.filters.priority.title"}}</label>
-        <ComboBox @value={{filterPriority}} @content={{priorities}} @onChange={{action (mut filterPriority)}} />
+        <ComboBox @value={{this.filterPriority}} @content={{this.priorities}} @onChange={{action (mut this.filterPriority)}} />
       </div>
 
       <div class="reviewable-filter">
         <label class="filter-label">{{i18n "review.filters.category"}}</label>
-        <CategoryChooser @value={{filterCategoryId}} @onChange={{action (mut filterCategoryId)}} @options={{hash
+        <CategoryChooser @value={{this.filterCategoryId}} @onChange={{action (mut this.filterCategoryId)}} @options={{hash
             none="review.filters.all_categories"
           }} />
       </div>
 
       <div class="reviewable-filter topic-filter">
         {{i18n "review.filtered_reviewed_by"}}
-        <EmailGroupUserChooser @value={{filterReviewedBy}} @onChange={{action "updateFilterReviewedBy"}} @options={{hash
+        <EmailGroupUserChooser @value={{this.filterReviewedBy}} @onChange={{action "updateFilterReviewedBy"}} @options={{hash
             maximum=1
             excludeCurrentUser=false
             fullWidthWrap=true
@@ -56,14 +56,14 @@
 
       <div class="reviewable-filter topic-filter">
         {{i18n "review.filtered_user"}}
-        <EmailGroupUserChooser @value={{filterUsername}} @onChange={{action "updateFilterUsername"}} @class="user-selector" @options={{hash
+        <EmailGroupUserChooser @value={{this.filterUsername}} @onChange={{action "updateFilterUsername"}} @class="user-selector" @options={{hash
             maximum=1
             excludeCurrentUser=false
             fullWidthWrap=true
           }} />
       </div>
 
-      {{#if filterTopic}}
+      {{#if this.filterTopic}}
         <div class="reviewable-filter topic-filter">
           {{i18n "review.filtered_topic"}}
           <DButton @class="btn-default" @label="review.show_all_topics" @icon="times" @action={{action "resetTopic"}} />
@@ -72,20 +72,20 @@
 
       <div class="reviewable-filter date-range">
         {{i18n "review.date_filter"}}
-        <DateTimeInputRange @from={{filterFromDate}} @to={{filterToDate}} @onChange={{setRange}} @showFromTime={{false}} @showToTime={{false}} />
+        <DateTimeInputRange @from={{this.filterFromDate}} @to={{this.filterToDate}} @onChange={{this.setRange}} @showFromTime={{false}} @showToTime={{false}} />
       </div>
 
       <div class="reviewable-filter sort-order">
         {{i18n "review.order_by"}}
-        <ComboBox @value={{filterSortOrder}} @content={{sortOrders}} @onChange={{action (mut filterSortOrder)}} />
+        <ComboBox @value={{this.filterSortOrder}} @content={{this.sortOrders}} @onChange={{action (mut this.filterSortOrder)}} />
       </div>
     {{/if}}
 
     <div class="reviewable-filters-actions">
       <DButton @icon="sync" @label="review.filters.refresh" @class="btn-primary refresh" @action={{action "refresh"}} />
 
-      {{#if site.mobileView}}
-        <DButton @label="show_help" @icon={{toggleFiltersIcon}} @class="btn-default expand-secondary-filters" @action={{action "toggleFilters"}} />
+      {{#if this.site.mobileView}}
+        <DButton @label="show_help" @icon={{this.toggleFiltersIcon}} @class="btn-default expand-secondary-filters" @action={{action "toggleFilters"}} />
       {{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/app/templates/review-settings.hbs b/app/assets/javascripts/discourse/app/templates/review-settings.hbs
index 46361571a6a..fb3fca8d56b 100644
--- a/app/assets/javascripts/discourse/app/templates/review-settings.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-settings.hbs
@@ -1,11 +1,11 @@
 <div class="reviewable-settings">
   <h4>{{i18n "review.settings.priorities.title"}}</h4>
 
-  {{#each scoreTypes as |rst|}}
+  {{#each this.scoreTypes as |rst|}}
     <div class="reviewable-score-type">
       <div class="title">{{rst.title}}</div>
       <div class="field">
-        <ComboBox @value={{rst.reviewable_priority}} @content={{settings.reviewable_priorities}} @onChange={{action (mut rst.reviewable_priority)}} />
+        <ComboBox @value={{rst.reviewable_priority}} @content={{this.settings.reviewable_priorities}} @onChange={{action (mut rst.reviewable_priority)}} />
       </div>
     </div>
   {{/each}}
@@ -13,9 +13,9 @@
   <div class="reviewable-score-type">
     <div class="title"></div>
     <div class="field">
-      <DButton @icon="check" @label="review.settings.save_changes" @class="btn-primary save-settings" @action={{action "save"}} @disabled={{saving}} />
+      <DButton @icon="check" @label="review.settings.save_changes" @class="btn-primary save-settings" @action={{action "save"}} @disabled={{this.saving}} />
 
-      {{#if saved}}
+      {{#if this.saved}}
         <span class="saved">{{i18n "review.settings.saved"}}</span>
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/review-show.hbs b/app/assets/javascripts/discourse/app/templates/review-show.hbs
index f4d03bb8ff4..803d906cbe8 100644
--- a/app/assets/javascripts/discourse/app/templates/review-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-show.hbs
@@ -1 +1 @@
-<ReviewableItem @reviewable={{reviewable}} />
+<ReviewableItem @reviewable={{this.reviewable}} />
diff --git a/app/assets/javascripts/discourse/app/templates/review-topics.hbs b/app/assets/javascripts/discourse/app/templates/review-topics.hbs
index 71ed48e57b7..1f0598cb388 100644
--- a/app/assets/javascripts/discourse/app/templates/review-topics.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review-topics.hbs
@@ -1,4 +1,4 @@
-{{#if reviewableTopics}}
+{{#if this.reviewableTopics}}
   <table class="reviewable-topics">
     <thead>
       <th>{{i18n "review.topics.topic"}} </th>
@@ -7,7 +7,7 @@
       <th></th>
     </thead>
     <tbody>
-      {{#each reviewableTopics as |rt|}}
+      {{#each this.reviewableTopics as |rt|}}
         <tr class="reviewable-topic">
           <td class="topic-title">
             <div class="combined-title">
diff --git a/app/assets/javascripts/discourse/app/templates/review.hbs b/app/assets/javascripts/discourse/app/templates/review.hbs
index 88d11a41cff..62f1979bb83 100644
--- a/app/assets/javascripts/discourse/app/templates/review.hbs
+++ b/app/assets/javascripts/discourse/app/templates/review.hbs
@@ -2,7 +2,7 @@
   <ul class="nav nav-pills reviewable-title">
     <NavItem @route="review.index" @label="review.view_all" />
     <NavItem @route="review.topics" @label="review.grouped_by_topic" />
-    {{#if currentUser.admin}}
+    {{#if this.currentUser.admin}}
       <NavItem @route="review.settings" @label="review.settings.title" @icon="wrench" />
     {{/if}}
   </ul>
diff --git a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
index 42870b58cfb..e1e99c3826e 100644
--- a/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
+++ b/app/assets/javascripts/discourse/app/templates/second-factor-auth.hbs
@@ -1,26 +1,26 @@
-{{#if message}}
-  <div class="alert {{alertClass}}">{{message}}</div>
+{{#if this.message}}
+  <div class="alert {{this.alertClass}}">{{this.message}}</div>
 {{/if}}
-{{#unless loadError}}
-  <h3>{{secondFactorTitle}}</h3>
-  {{#if customDescription}}
-    <p class="action-description">{{customDescription}}</p>
+{{#unless this.loadError}}
+  <h3>{{this.secondFactorTitle}}</h3>
+  {{#if this.customDescription}}
+    <p class="action-description">{{this.customDescription}}</p>
   {{/if}}
-  <p>{{secondFactorDescription}}</p>
-  {{#if showSecurityKeyForm}}
+  <p>{{this.secondFactorDescription}}</p>
+  {{#if this.showSecurityKeyForm}}
     <div id="security-key">
       <DButton @action={{action "authenticateSecurityKey"}} @icon="key" @id="security-key-authenticate-button" @label="login.security_key_authenticate" @type="button" @class="btn btn-large btn-primary" />
     </div>
-  {{else if (or showTotpForm showBackupCodesForm)}}
-    <form class={{inputFormClass}}>
-      <SecondFactorInput @value={{secondFactorToken}} @secondFactorMethod={{shownSecondFactorMethod}} @onTokenInput={{action "onTokenInput"}} />
+  {{else if (or this.showTotpForm this.showBackupCodesForm)}}
+    <form class={{this.inputFormClass}}>
+      <SecondFactorInput @value={{this.secondFactorToken}} @secondFactorMethod={{this.shownSecondFactorMethod}} @onTokenInput={{action "onTokenInput"}} />
       <DButton @action={{action "authenticateToken"}} @class="btn-primary" @label="submit" @type="submit" />
     </form>
   {{/if}}
 
-  {{#if alternativeMethods.length}}
+  {{#if this.alternativeMethods.length}}
     <p>
-      {{#each alternativeMethods as |method index|}}
+      {{#each this.alternativeMethods as |method index|}}
         {{#if (gt index 0)}}
           <span>&middot;</span>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/selected-posts.hbs b/app/assets/javascripts/discourse/app/templates/selected-posts.hbs
index 832e6046c34..23b60cae75d 100644
--- a/app/assets/javascripts/discourse/app/templates/selected-posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/selected-posts.hbs
@@ -1 +1 @@
-<SelectedPosts @selectedPostsCount={{selectedPostsCount}} @canSelectAll={{canSelectAll}} @canDeselectAll={{canDeselectAll}} @canDeleteSelected={{canDeleteSelected}} @canMergeTopic={{canMergeTopic}} @canChangeOwner={{canChangeOwner}} @canMergePosts={{canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
+<SelectedPosts @selectedPostsCount={{this.selectedPostsCount}} @canSelectAll={{this.canSelectAll}} @canDeselectAll={{this.canDeselectAll}} @canDeleteSelected={{this.canDeleteSelected}} @canMergeTopic={{this.canMergeTopic}} @canChangeOwner={{this.canChangeOwner}} @canMergePosts={{this.canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/static.hbs b/app/assets/javascripts/discourse/app/templates/static.hbs
index f6b35c75b0b..9e1fced4df3 100644
--- a/app/assets/javascripts/discourse/app/templates/static.hbs
+++ b/app/assets/javascripts/discourse/app/templates/static.hbs
@@ -1,20 +1,20 @@
-<DSection @bodyClass={{bodyClass}} @class="container">
-  <WatchRead @action={{action "markFaqRead"}} @path={{model.path}}>
+<DSection @bodyClass={{this.bodyClass}} @class="container">
+  <WatchRead @action={{action "markFaqRead"}} @path={{this.model.path}}>
     <div class="contents clearfix body-page">
 
       <PluginOutlet @name="above-static" @tagName="span" @connectorTagName="div" />
 
-      {{html-safe model.html}}
+      {{html-safe this.model.html}}
 
       <PluginOutlet @name="below-static" @connectorTagName="div" />
 
-      {{#if anyButtons}}
+      {{#if this.anyButtons}}
         <div class="body-page-button-container">
-          {{#if showSignupButton}}
+          {{#if this.showSignupButton}}
             <DButton @action={{route-action "showCreateAccount"}} @class="btn-primary sign-up-button" @label="sign_up" />
           {{/if}}
 
-          {{#if showLoginButton}}
+          {{#if this.showLoginButton}}
             <DButton @action={{route-action "showLogin"}} @class="btn-primary login-button" @icon="user" @label="log_in" />
           {{/if}}
         </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs
index f98dcdced40..7ed00f084a6 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups-edit.hbs
@@ -1,4 +1,4 @@
 <div class="tag-group-content">
   <h3>{{i18n "tagging.groups.edit_title"}}</h3>
-  <TagGroupsForm @model={{model}} @onDestroy={{action "onDestroy"}} />
+  <TagGroupsForm @model={{this.model}} @onDestroy={{action "onDestroy"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
index 773ca5179ee..29c430ef3f7 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups-index.hbs
@@ -1,6 +1,6 @@
 <div class="tag-group-content">
   <h3>
-    {{#if model}}
+    {{#if this.model}}
       {{i18n "tagging.groups.about_heading"}}
     {{else}}
       {{i18n "tagging.groups.about_heading_empty"}}
@@ -10,7 +10,7 @@
     <p>{{i18n "tagging.groups.about_description"}}</p>
   </section>
   <section>
-    {{#unless model}}
+    {{#unless this.model}}
       <LinkTo @route="tagGroups.new" class="btn btn-primary">
         {{d-icon "plus"}} {{i18n "tagging.groups.new"}}
       </LinkTo>
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs
index 6f163edbba8..4bd34445a82 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups-new.hbs
@@ -1,4 +1,4 @@
 <div class="tag-group-content">
   <h3>{{i18n "tagging.groups.new_title"}}</h3>
-  <TagGroupsForm @model={{model}} @onSave={{action "onSave"}} />
+  <TagGroupsForm @model={{this.model}} @onSave={{action "onSave"}} />
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tag-groups.hbs b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
index 0a9ead67498..02c8d01a745 100644
--- a/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag-groups.hbs
@@ -7,10 +7,10 @@
   <h2>{{i18n "tagging.groups.title"}}</h2>
 
   {{#if this.siteSettings.tagging_enabled}}
-    {{#if model}}
+    {{#if this.model}}
       <div class="tag-groups-sidebar content-list">
         <ul>
-          {{#each model as |tagGroup|}}
+          {{#each this.model as |tagGroup|}}
             <li>
               <LinkTo @route="tagGroups.edit" @model={{tagGroup}}>
                 {{tagGroup.name}}
diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
index 1b9cb779f2a..afc2d8e4dde 100644
--- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs
@@ -1,6 +1,6 @@
-<DSection @tagName="" @pageClass="tags" @bodyClass={{concat "tag-" tag.id (if category.slug (concat " category-" category.slug)) "" (if additionalTags " tags-intersection")}}>
+<DSection @tagName="" @pageClass="tags" @bodyClass={{concat "tag-" this.tag.id (if this.category.slug (concat " category-" this.category.slug)) "" (if this.additionalTags " tags-intersection")}}>
   <div class="container">
-    <DiscourseBanner @user={{currentUser}} @banner={{site.banner}} />
+    <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
   </div>
 
   <PluginOutlet @name="discovery-list-controls-above" @tagName="span" @connectorTagName="div" />
@@ -9,20 +9,20 @@
     <PluginOutlet @name="discovery-navigation-bar-above" @connectorTagName="div" />
     <div class="container">
       <section class="navigation-container tag-navigation">
-        <DNavigation @filterMode={{filterMode}} @canCreateTopic={{canCreateTopic}} @hasDraft={{currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @category={{category}} @tag={{tag}} @noSubcategories={{noSubcategories}} @tagNotification={{tagNotification}} @additionalTags={{additionalTags}} @showInfo={{showInfo}} @canCreateTopicOnTag={{canCreateTopicOnTag}} @changeTagNotificationLevel={{action "changeTagNotificationLevel"}} @toggleInfo={{action "toggleInfo"}} />
+        <DNavigation @filterMode={{this.filterMode}} @canCreateTopic={{this.canCreateTopic}} @hasDraft={{this.currentUser.has_topic_draft}} @createTopic={{route-action "createTopic"}} @category={{this.category}} @tag={{this.tag}} @noSubcategories={{this.noSubcategories}} @tagNotification={{this.tagNotification}} @additionalTags={{this.additionalTags}} @showInfo={{this.showInfo}} @canCreateTopicOnTag={{this.canCreateTopicOnTag}} @changeTagNotificationLevel={{action "changeTagNotificationLevel"}} @toggleInfo={{action "toggleInfo"}} />
 
-        <PluginOutlet @name="tag-navigation" @connectorTagName="div" @args={{hash category=category tag=tag}} />
+        <PluginOutlet @name="tag-navigation" @connectorTagName="div" @args={{hash category=this.category tag=this.tag}} />
       </section>
     </div>
   </div>
 
-  {{#if showInfo}}
-    <TagInfo @tag={{tag}} @list={{list}} @deleteAction={{action "deleteTag"}} />
+  {{#if this.showInfo}}
+    <TagInfo @tag={{this.tag}} @list={{this.list}} @deleteAction={{action "deleteTag"}} />
   {{/if}}
 
-  <PluginOutlet @name="discovery-list-container-top" @tagName="span" @connectorTagName="div" @args={{hash category=category}} />
+  <PluginOutlet @name="discovery-list-container-top" @tagName="span" @connectorTagName="div" @args={{hash category=this.category}} />
 
-  <TopicDismissButtons @position="top" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+  <TopicDismissButtons @position="top" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
   <PluginOutlet @name="discovery-above" @tagName="span" @connectorTagName="div" />
 
@@ -31,39 +31,39 @@
       <div class="full-width">
         <PluginOutlet @name="before-list-area" />
         <div id="list-area">
-          {{#unless loading}}
-            <DiscoveryTopicsList @model={{list}} @refresh={{action "refresh"}} @autoAddTopicsToBulkSelect={{autoAddTopicsToBulkSelect}} @bulkSelectEnabled={{bulkSelectEnabled}} @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}} as |discoveryTopicList|>
-              {{#if top}}
+          {{#unless this.loading}}
+            <DiscoveryTopicsList @model={{this.list}} @refresh={{action "refresh"}} @autoAddTopicsToBulkSelect={{this.autoAddTopicsToBulkSelect}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @addTopicsToBulkSelect={{action "addTopicsToBulkSelect"}} as |discoveryTopicList|>
+              {{#if this.top}}
                 <div class="top-lists">
-                  <PeriodChooser @period={{period}} @action={{action "changePeriod"}} @fullDay={{false}} />
+                  <PeriodChooser @period={{this.period}} @action={{action "changePeriod"}} @fullDay={{false}} />
                 </div>
               {{else}}
-                {{#if topicTrackingState.hasIncoming}}
-                  <div class="show-more {{if hasTopics "has-topics"}}">
+                {{#if this.topicTrackingState.hasIncoming}}
+                  <div class="show-more {{if this.hasTopics "has-topics"}}">
                     <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
-                      <CountI18n @key="topic_count_" @suffix={{topicTrackingState.filter}} @count={{topicTrackingState.incomingCount}} />
+                      <CountI18n @key="topic_count_" @suffix={{this.topicTrackingState.filter}} @count={{this.topicTrackingState.incomingCount}} />
                     </a>
                   </div>
                 {{/if}}
               {{/if}}
 
-              {{#if list.topics}}
-                <TopicList @topics={{list.topics}} @canBulkSelect={{canBulkSelect}} @toggleBulkSelect={{action "toggleBulkSelect"}} @bulkSelectEnabled={{bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} @selected={{selected}} @category={{category}} @showPosters={{true}} @order={{order}} @ascending={{ascending}} @changeSort={{action "changeSort"}} @onScroll={{discoveryTopicList.saveScrollPosition}} @scrollOnLoad={{true}} @focusLastVisitedTopic={{true}} />
+              {{#if this.list.topics}}
+                <TopicList @topics={{this.list.topics}} @canBulkSelect={{this.canBulkSelect}} @toggleBulkSelect={{action "toggleBulkSelect"}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} @selected={{this.selected}} @category={{this.category}} @showPosters={{true}} @order={{this.order}} @ascending={{this.ascending}} @changeSort={{action "changeSort"}} @onScroll={{discoveryTopicList.saveScrollPosition}} @scrollOnLoad={{true}} @focusLastVisitedTopic={{true}} />
               {{/if}}
             </DiscoveryTopicsList>
 
             <footer class="topic-list-bottom">
-              <TopicDismissButtons @position="bottom" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+              <TopicDismissButtons @position="bottom" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-              {{#unless list.canLoadMore}}
-                <FooterMessage @education={{footerEducation}} @message={{footerMessage}}>
+              {{#unless this.list.canLoadMore}}
+                <FooterMessage @education={{this.footerEducation}} @message={{this.footerMessage}}>
                   <LinkTo @route="tags"> {{i18n "topic.browse_all_tags"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo>.
                 </FooterMessage>
               {{/unless}}
             </footer>
           {{/unless}}
 
-          <ConditionalLoadingSpinner @condition={{list.loadingMore}} />
+          <ConditionalLoadingSpinner @condition={{this.list.loadingMore}} />
         </div>
       </div>
     </div>
diff --git a/app/assets/javascripts/discourse/app/templates/tags/index.hbs b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
index 905cf45a959..a6c07e90f19 100644
--- a/app/assets/javascripts/discourse/app/templates/tags/index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/tags/index.hbs
@@ -1,36 +1,36 @@
 <div class="container">
-  <DiscourseBanner @user={{currentUser}} @banner={{site.banner}} />
+  <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} />
 </div>
 
 <div class="list-controls">
   <div class="container tags-controls">
-    {{#if canAdminTags}}
-      <TagsAdminDropdown @actionsMapping={{actionsMapping}} />
+    {{#if this.canAdminTags}}
+      <TagsAdminDropdown @actionsMapping={{this.actionsMapping}} />
     {{/if}}
     <h2>{{i18n "tagging.tags"}}</h2>
   </div>
 </div>
 
-<PluginOutlet @name="tags-below-title" @connectorTagName="div" @tagName="div" @args={{hash model=model}} />
+<PluginOutlet @name="tags-below-title" @connectorTagName="div" @tagName="div" @args={{hash model=this.model}} />
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
-  <span class="tag-sort-name {{if sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
+  <span class="tag-sort-count {{if this.sortedByCount "active"}}"><a href {{action "sortByCount"}}>{{i18n "tagging.sort_by_count"}}</a></span>
+  <span class="tag-sort-name {{if this.sortedByName "active"}}"><a href {{action "sortById"}}>{{i18n "tagging.sort_by_name"}}</a></span>
 </div>
 
 <hr>
 
 <div class="all-tag-lists">
-  {{#each model.extras.categories as |category|}}
-    <TagList @tags={{category.tags}} @sortProperties={{sortProperties}} @categoryId={{category.id}} />
+  {{#each this.model.extras.categories as |category|}}
+    <TagList @tags={{category.tags}} @sortProperties={{this.sortProperties}} @categoryId={{category.id}} />
   {{/each}}
 
-  {{#each model.extras.tag_groups as |tagGroup|}}
-    <TagList @tags={{tagGroup.tags}} @sortProperties={{sortProperties}} @tagGroupName={{tagGroup.name}} />
+  {{#each this.model.extras.tag_groups as |tagGroup|}}
+    <TagList @tags={{tagGroup.tags}} @sortProperties={{this.sortProperties}} @tagGroupName={{tagGroup.name}} />
   {{/each}}
 
-  {{#if model}}
-    <TagList @tags={{model}} @sortProperties={{sortProperties}} @titleKey={{otherTagsTitleKey}} />
+  {{#if this.model}}
+    <TagList @tags={{this.model}} @sortProperties={{this.sortProperties}} @titleKey={{this.otherTagsTitleKey}} />
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/topic.hbs b/app/assets/javascripts/discourse/app/templates/topic.hbs
index 769a463990d..b98ca252de3 100644
--- a/app/assets/javascripts/discourse/app/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/app/templates/topic.hbs
@@ -1,89 +1,89 @@
-<DiscourseTopic @multiSelect={{multiSelect}} @enteredAt={{enteredAt}} @topic={{model}} @hasScrolled={{hasScrolled}}>
-  {{#if model}}
-    <AddCategoryTagClasses @category={{model.category}} @tags={{model.tags}} />
-    <AddTopicStatusClasses @topic={{model}} />
+<DiscourseTopic @multiSelect={{this.multiSelect}} @enteredAt={{this.enteredAt}} @topic={{this.model}} @hasScrolled={{this.hasScrolled}}>
+  {{#if this.model}}
+    <AddCategoryTagClasses @category={{this.model.category}} @tags={{this.model.tags}} />
+    <AddTopicStatusClasses @topic={{this.model}} />
     <div class="container">
-      <DiscourseBanner @user={{currentUser}} @banner={{site.banner}} @overlay={{hasScrolled}} @hide={{model.errorLoading}} />
+      <DiscourseBanner @user={{this.currentUser}} @banner={{this.site.banner}} @overlay={{this.hasScrolled}} @hide={{this.model.errorLoading}} />
     </div>
   {{/if}}
 
-  {{#if showSharedDraftControls}}
-    <SharedDraftControls @topic={{model}} />
+  {{#if this.showSharedDraftControls}}
+    <SharedDraftControls @topic={{this.model}} />
   {{/if}}
 
-  <PluginOutlet @name="topic-above-post-stream" @tagName="span" @connectorTagName="div" @args={{hash model=model editFirstPost=(action "editFirstPost")}} />
+  <PluginOutlet @name="topic-above-post-stream" @tagName="span" @connectorTagName="div" @args={{hash model=this.model editFirstPost=(action "editFirstPost")}} />
 
-  {{#if model.postStream.loaded}}
-    {{#if model.postStream.firstPostPresent}}
-      <TopicTitle @cancelled={{action "cancelEditingTopic"}} @save={{action "finishedEditingTopic"}} @model={{model}}>
-        {{#if editingTopic}}
+  {{#if this.model.postStream.loaded}}
+    {{#if this.model.postStream.firstPostPresent}}
+      <TopicTitle @cancelled={{action "cancelEditingTopic"}} @save={{action "finishedEditingTopic"}} @model={{this.model}}>
+        {{#if this.editingTopic}}
           <div class="edit-topic-title">
-            <PrivateMessageGlyph @shouldShow={{model.isPrivateMessage}} @tagName="" />
+            <PrivateMessageGlyph @shouldShow={{this.model.isPrivateMessage}} @tagName="" />
 
-            <TextField @id="edit-title" @value={{buffered.title}} @maxlength={{siteSettings.max_topic_title_length}} @autofocus="true" />
+            <TextField @id="edit-title" @value={{this.buffered.title}} @maxlength={{this.siteSettings.max_topic_title_length}} @autofocus="true" />
 
-            {{#if showCategoryChooser}}
-              <CategoryChooser @class="small" @value={{buffered.category_id}} @onChange={{action "topicCategoryChanged"}} />
+            {{#if this.showCategoryChooser}}
+              <CategoryChooser @class="small" @value={{this.buffered.category_id}} @onChange={{action "topicCategoryChanged"}} />
             {{/if}}
 
-            {{#if canEditTags}}
-              <MiniTagChooser @value={{buffered.tags}} @onChange={{action "topicTagsChanged"}} @options={{hash
+            {{#if this.canEditTags}}
+              <MiniTagChooser @value={{this.buffered.tags}} @onChange={{action "topicTagsChanged"}} @options={{hash
                   filterable=true
-                  categoryId=buffered.category_id
-                  minimum=minimumRequiredTags
+                  categoryId=this.buffered.category_id
+                  minimum=this.minimumRequiredTags
                 }} />
             {{/if}}
 
-            <PluginOutlet @name="edit-topic" @tagName="span" @connectorTagName="div" @args={{hash model=model buffered=buffered}} />
+            <PluginOutlet @name="edit-topic" @tagName="span" @connectorTagName="div" @args={{hash model=this.model buffered=this.buffered}} />
 
             <div class="edit-controls">
               <DButton @action={{action "finishedEditingTopic"}} @class="btn-primary submit-edit" @icon="check" @ariaLabel="composer.save_edit" />
               <DButton @action={{action "cancelEditingTopic"}} @class="btn-default cancel-edit" @icon="times" @ariaLabel="composer.cancel" />
 
-              {{#if canRemoveTopicFeaturedLink}}
+              {{#if this.canRemoveTopicFeaturedLink}}
                 <a href {{action "removeFeaturedLink"}} class="remove-featured-link" title={{i18n "composer.remove_featured_link"}}>
                   {{d-icon "times-circle"}}
-                  {{featuredLinkDomain}}
+                  {{this.featuredLinkDomain}}
                 </a>
               {{/if}}
             </div>
           </div>
 
         {{else}}
-          <h1 data-topic-id={{model.id}}>
-            {{#unless model.is_warning}}
-              {{#if siteSettings.enable_personal_messages}}
-                <PrivateMessageGlyph @shouldShow={{model.isPrivateMessage}} @href={{pmPath}} @title="topic_statuses.personal_message.title" @ariaLabel="user.messages.inbox" @tagName="" />
+          <h1 data-topic-id={{this.model.id}}>
+            {{#unless this.model.is_warning}}
+              {{#if this.siteSettings.enable_personal_messages}}
+                <PrivateMessageGlyph @shouldShow={{this.model.isPrivateMessage}} @href={{this.pmPath}} @title="topic_statuses.personal_message.title" @ariaLabel="user.messages.inbox" @tagName="" />
               {{else}}
-                <PrivateMessageGlyph @shouldShow={{model.isPrivateMessage}} @tagName="" />
+                <PrivateMessageGlyph @shouldShow={{this.model.isPrivateMessage}} @tagName="" />
               {{/if}}
             {{/unless}}
 
-            {{#if model.details.loaded}}
-              <TopicStatus @topic={{model}} />
-              <a href={{model.url}} {{action "jumpTop"}} class="fancy-title">
-                {{html-safe model.fancyTitle}}
+            {{#if this.model.details.loaded}}
+              <TopicStatus @topic={{this.model}} />
+              <a href={{this.model.url}} {{action "jumpTop"}} class="fancy-title">
+                {{html-safe this.model.fancyTitle}}
               </a>
             {{/if}}
 
-            {{#if model.details.can_edit}}
+            {{#if this.model.details.can_edit}}
               <a href {{action "editTopic"}} class="edit-topic" title={{i18n "edit"}}>{{d-icon "pencil-alt"}}</a>
             {{/if}}
           </h1>
 
-          <TopicCategory @topic={{model}} @class="topic-category" />
+          <TopicCategory @topic={{this.model}} @class="topic-category" />
         {{/if}}
       </TopicTitle>
 
-      {{#if model.publishedPage}}
+      {{#if this.model.publishedPage}}
         <div class="published-page-notice">
           <div class="details">
-            {{#if model.publishedPage.public}}
+            {{#if this.model.publishedPage.public}}
               <span class="is-public">{{i18n "topic.publish_page.public"}}</span>
             {{/if}}
             {{i18n "topic.publish_page.topic_published"}}
             <div>
-              <a href={{model.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{model.publishedPage.url}}</a>
+              <a href={{this.model.publishedPage.url}} target="_blank" rel="noopener noreferrer">{{this.model.publishedPage.url}}</a>
             </div>
           </div>
           <div class="controls">
@@ -95,47 +95,47 @@
     {{/if}}
 
     <div class="container posts">
-      <div class="selected-posts {{unless multiSelect "hidden"}}">
-        <SelectedPosts @selectedPostsCount={{selectedPostsCount}} @canSelectAll={{canSelectAll}} @canDeselectAll={{canDeselectAll}} @canDeleteSelected={{canDeleteSelected}} @canMergeTopic={{canMergeTopic}} @canChangeOwner={{canChangeOwner}} @canMergePosts={{canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
+      <div class="selected-posts {{unless this.multiSelect "hidden"}}">
+        <SelectedPosts @selectedPostsCount={{this.selectedPostsCount}} @canSelectAll={{this.canSelectAll}} @canDeselectAll={{this.canDeselectAll}} @canDeleteSelected={{this.canDeleteSelected}} @canMergeTopic={{this.canMergeTopic}} @canChangeOwner={{this.canChangeOwner}} @canMergePosts={{this.canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
       </div>
 
       <PluginOutlet @name="above-timeline" @connectorTagName="div" />
 
-      <TopicNavigation @class="topic-navigation" @topic={{model}} @jumpToDate={{action "jumpToDate"}} @jumpToIndex={{action "jumpToIndex"}} as |info|>
-        <PluginOutlet @name="topic-navigation" @connectorTagName="div" @args={{hash topic=model}} />
+      <TopicNavigation @class="topic-navigation" @topic={{this.model}} @jumpToDate={{action "jumpToDate"}} @jumpToIndex={{action "jumpToIndex"}} as |info|>
+        <PluginOutlet @name="topic-navigation" @connectorTagName="div" @args={{hash topic=this.model}} />
 
         {{#if info.renderTimeline}}
-          <TopicTimeline @topic={{model}} @notificationLevel={{model.details.notification_level}} @prevEvent={{info.prevEvent}} @fullscreen={{info.topicProgressExpanded}} @enteredIndex={{enteredIndex}} @loading={{model.postStream.loading}} @jumpToPost={{action "jumpToPost"}} @jumpTop={{action "jumpTop"}} @jumpBottom={{action "jumpBottom"}} @jumpEnd={{action "jumpEnd"}} @jumpToPostPrompt={{action "jumpToPostPrompt"}} @jumpToIndex={{action "jumpToIndex"}} @replyToPost={{action "replyToPost"}} @showSummary={{action "showSummary"}} @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} />
+          <TopicTimeline @topic={{this.model}} @notificationLevel={{this.model.details.notification_level}} @prevEvent={{info.prevEvent}} @fullscreen={{info.topicProgressExpanded}} @enteredIndex={{this.enteredIndex}} @loading={{this.model.postStream.loading}} @jumpToPost={{action "jumpToPost"}} @jumpTop={{action "jumpTop"}} @jumpBottom={{action "jumpBottom"}} @jumpEnd={{action "jumpEnd"}} @jumpToPostPrompt={{action "jumpToPostPrompt"}} @jumpToIndex={{action "jumpToIndex"}} @replyToPost={{action "replyToPost"}} @showSummary={{action "showSummary"}} @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} />
         {{else}}
-          <TopicProgress @prevEvent={{info.prevEvent}} @topic={{model}} @expanded={{info.topicProgressExpanded}} @jumpToPost={{action "jumpToPost"}}>
-            <PluginOutlet @name="before-topic-progress" @tagName="span" @connectorTagName="div" @args={{hash model=model jumpToPost=(action "jumpToPost")}} />
-            <TopicAdminMenuButton @topic={{model}} @openUpwards="true" @rightSide="true" @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} />
+          <TopicProgress @prevEvent={{info.prevEvent}} @topic={{this.model}} @expanded={{info.topicProgressExpanded}} @jumpToPost={{action "jumpToPost"}}>
+            <PluginOutlet @name="before-topic-progress" @tagName="span" @connectorTagName="div" @args={{hash model=this.model jumpToPost=(action "jumpToPost")}} />
+            <TopicAdminMenuButton @topic={{this.model}} @openUpwards="true" @rightSide="true" @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} />
           </TopicProgress>
         {{/if}}
       </TopicNavigation>
 
       <div class="row">
-        <section class="topic-area" id="topic" data-topic-id={{model.id}}>
+        <section class="topic-area" id="topic" data-topic-id={{this.model.id}}>
 
           <div class="posts-wrapper">
-            <ConditionalLoadingSpinner @condition={{model.postStream.loadingAbove}} />
+            <ConditionalLoadingSpinner @condition={{this.model.postStream.loadingAbove}} />
 
-            <PluginOutlet @name="topic-above-posts" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+            <PluginOutlet @name="topic-above-posts" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-            {{#unless model.postStream.loadingFilter}}
-              <ScrollingPostStream @posts={{postsToRender}} @canCreatePost={{model.details.can_create_post}} @multiSelect={{multiSelect}} @selectedPostsCount={{selectedPostsCount}} @filteredPostsCount={{model.postStream.filteredPostsCount}} @selectedQuery={{selectedQuery}} @gaps={{model.postStream.gaps}} @showReadIndicator={{model.show_read_indicator}} @streamFilters={{model.postStream.streamFilters}} @lastReadPostNumber={{userLastReadPostNumber}} @highestPostNumber={{highestPostNumber}} @showFlags={{action "showPostFlags"}} @editPost={{action "editPost"}} @showHistory={{route-action "showHistory"}} @showLogin={{route-action "showLogin"}} @showRawEmail={{route-action "showRawEmail"}} @deletePost={{action "deletePost"}} @permanentlyDeletePost={{action "permanentlyDeletePost"}} @recoverPost={{action "recoverPost"}} @expandHidden={{action "expandHidden"}} @toggleBookmark={{action "toggleBookmark"}} @togglePostType={{action "togglePostType"}} @rebakePost={{action "rebakePost"}} @changePostOwner={{action "changePostOwner"}} @grantBadge={{action "grantBadge"}} @changeNotice={{action "changeNotice"}} @lockPost={{action "lockPost"}} @unlockPost={{action "unlockPost"}} @unhidePost={{action "unhidePost"}} @replyToPost={{action "replyToPost"}} @toggleWiki={{action "toggleWiki"}} @showSummary={{action "showSummary"}} @cancelFilter={{action "cancelFilter"}} @removeAllowedUser={{action "removeAllowedUser"}} @removeAllowedGroup={{action "removeAllowedGroup"}} @topVisibleChanged={{action "topVisibleChanged"}} @currentPostChanged={{action "currentPostChanged"}} @currentPostScrolled={{action "currentPostScrolled"}} @bottomVisibleChanged={{action "bottomVisibleChanged"}} @togglePostSelection={{action "togglePostSelection"}} @selectReplies={{action "selectReplies"}} @selectBelow={{action "selectBelow"}} @fillGapBefore={{action "fillGapBefore"}} @fillGapAfter={{action "fillGapAfter"}} @showInvite={{route-action "showInvite"}} @showPagePublish={{route-action "showPagePublish"}} />
+            {{#unless this.model.postStream.loadingFilter}}
+              <ScrollingPostStream @posts={{this.postsToRender}} @canCreatePost={{this.model.details.can_create_post}} @multiSelect={{this.multiSelect}} @selectedPostsCount={{this.selectedPostsCount}} @filteredPostsCount={{this.model.postStream.filteredPostsCount}} @selectedQuery={{this.selectedQuery}} @gaps={{this.model.postStream.gaps}} @showReadIndicator={{this.model.show_read_indicator}} @streamFilters={{this.model.postStream.streamFilters}} @lastReadPostNumber={{this.userLastReadPostNumber}} @highestPostNumber={{this.highestPostNumber}} @showFlags={{action "showPostFlags"}} @editPost={{action "editPost"}} @showHistory={{route-action "showHistory"}} @showLogin={{route-action "showLogin"}} @showRawEmail={{route-action "showRawEmail"}} @deletePost={{action "deletePost"}} @permanentlyDeletePost={{action "permanentlyDeletePost"}} @recoverPost={{action "recoverPost"}} @expandHidden={{action "expandHidden"}} @toggleBookmark={{action "toggleBookmark"}} @togglePostType={{action "togglePostType"}} @rebakePost={{action "rebakePost"}} @changePostOwner={{action "changePostOwner"}} @grantBadge={{action "grantBadge"}} @changeNotice={{action "changeNotice"}} @lockPost={{action "lockPost"}} @unlockPost={{action "unlockPost"}} @unhidePost={{action "unhidePost"}} @replyToPost={{action "replyToPost"}} @toggleWiki={{action "toggleWiki"}} @showSummary={{action "showSummary"}} @cancelFilter={{action "cancelFilter"}} @removeAllowedUser={{action "removeAllowedUser"}} @removeAllowedGroup={{action "removeAllowedGroup"}} @topVisibleChanged={{action "topVisibleChanged"}} @currentPostChanged={{action "currentPostChanged"}} @currentPostScrolled={{action "currentPostScrolled"}} @bottomVisibleChanged={{action "bottomVisibleChanged"}} @togglePostSelection={{action "togglePostSelection"}} @selectReplies={{action "selectReplies"}} @selectBelow={{action "selectBelow"}} @fillGapBefore={{action "fillGapBefore"}} @fillGapAfter={{action "fillGapAfter"}} @showInvite={{route-action "showInvite"}} @showPagePublish={{route-action "showPagePublish"}} />
             {{/unless}}
 
-            <ConditionalLoadingSpinner @condition={{model.postStream.loadingBelow}} />
+            <ConditionalLoadingSpinner @condition={{this.model.postStream.loadingBelow}} />
           </div>
           <div id="topic-bottom"></div>
 
-          <ConditionalLoadingSpinner @condition={{model.postStream.loadingFilter}}>
-            {{#if loadedAllPosts}}
+          <ConditionalLoadingSpinner @condition={{this.model.postStream.loadingFilter}}>
+            {{#if this.loadedAllPosts}}
 
-              {{#if model.pending_posts}}
+              {{#if this.model.pending_posts}}
                 <div class="pending-posts">
-                  {{#each model.pending_posts as |pending|}}
+                  {{#each this.model.pending_posts as |pending|}}
                     <div class="reviewable-item">
                       <div class="reviewable-meta-data">
                         <span class="reviewable-type">
@@ -146,9 +146,9 @@
                         </span>
                       </div>
                       <div class="post-contents-wrapper">
-                        <ReviewableCreatedBy @user={{currentUser}} @tagName="" />
+                        <ReviewableCreatedBy @user={{this.currentUser}} @tagName="" />
                         <div class="post-contents">
-                          <ReviewableCreatedByName @user={{currentUser}} @tagName="" />
+                          <ReviewableCreatedByName @user={{this.currentUser}} @tagName="" />
                           <div class="post-body"><CookText @rawText={{pending.raw}} /></div>
                         </div>
                       </div>
@@ -160,25 +160,25 @@
                 </div>
               {{/if}}
 
-              {{#if model.queued_posts_count}}
+              {{#if this.model.queued_posts_count}}
                 <div class="has-pending-posts">
                   <div>
-                    {{html-safe (i18n "review.topic_has_pending" count=model.queued_posts_count)}}
+                    {{html-safe (i18n "review.topic_has_pending" count=this.model.queued_posts_count)}}
                   </div>
 
-                  <LinkTo @route="review" @query={{hash topic_id=model.id type="ReviewableQueuedPost" status="pending"}}>
+                  <LinkTo @route="review" @query={{hash topic_id=this.model.id type="ReviewableQueuedPost" status="pending"}}>
                     {{i18n "review.view_pending"}}
                   </LinkTo>
                 </div>
               {{/if}}
 
-              <SlowModeInfo @topic={{model}} @user={{currentUser}} @tagName="" />
+              <SlowModeInfo @topic={{this.model}} @user={{this.currentUser}} @tagName="" />
 
-              <TopicTimerInfo @topicClosed={{model.closed}} @statusType={{model.topic_timer.status_type}} @executeAt={{model.topic_timer.execute_at}} @basedOnLastPost={{model.topic_timer.based_on_last_post}} @durationMinutes={{model.topic_timer.duration_minutes}} @categoryId={{model.topic_timer.category_id}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @removeTopicTimer={{action "removeTopicTimer" model.topic_timer.status_type "topic_timer"}} />
+              <TopicTimerInfo @topicClosed={{this.model.closed}} @statusType={{this.model.topic_timer.status_type}} @executeAt={{this.model.topic_timer.execute_at}} @basedOnLastPost={{this.model.topic_timer.based_on_last_post}} @durationMinutes={{this.model.topic_timer.duration_minutes}} @categoryId={{this.model.topic_timer.category_id}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @removeTopicTimer={{action "removeTopicTimer" this.model.topic_timer.status_type "topic_timer"}} />
 
-              {{#if showSelectedPostsAtBottom}}
-                <div class="selected-posts {{unless multiSelect "hidden"}} {{if showSelectedPostsAtBottom "hidden"}}">
-                  <SelectedPosts @selectedPostsCount={{selectedPostsCount}} @canSelectAll={{canSelectAll}} @canDeselectAll={{canDeselectAll}} @canDeleteSelected={{canDeleteSelected}} @canMergeTopic={{canMergeTopic}} @canChangeOwner={{canChangeOwner}} @canMergePosts={{canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
+              {{#if this.showSelectedPostsAtBottom}}
+                <div class="selected-posts {{unless this.multiSelect "hidden"}} {{if this.showSelectedPostsAtBottom "hidden"}}">
+                  <SelectedPosts @selectedPostsCount={{this.selectedPostsCount}} @canSelectAll={{this.canSelectAll}} @canDeselectAll={{this.canDeselectAll}} @canDeleteSelected={{this.canDeleteSelected}} @canMergeTopic={{this.canMergeTopic}} @canChangeOwner={{this.canChangeOwner}} @canMergePosts={{this.canMergePosts}} @toggleMultiSelect={{action "toggleMultiSelect"}} @mergePosts={{action "mergePosts"}} @deleteSelected={{action "deleteSelected"}} @deselectAll={{action "deselectAll"}} @selectAll={{action "selectAll"}} />
                 </div>
               {{/if}}
 
@@ -189,15 +189,15 @@
       </div>
 
     </div>
-    {{#if loadedAllPosts}}
-      {{#if session.showSignupCta}}
+    {{#if this.loadedAllPosts}}
+      {{#if this.session.showSignupCta}}
         {{! replace "Log In to Reply" with the infobox }}
         <SignupCta />
       {{else}}
-        {{#if currentUser}}
-          <PluginOutlet @name="topic-above-footer-buttons" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+        {{#if this.currentUser}}
+          <PluginOutlet @name="topic-above-footer-buttons" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
 
-          <TopicFooterButtons @topic={{model}} @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} @toggleBookmark={{action "toggleBookmark"}} @showFlagTopic={{route-action "showFlagTopic"}} @toggleArchiveMessage={{action "toggleArchiveMessage"}} @editFirstPost={{action "editFirstPost"}} @deferTopic={{action "deferTopic"}} @replyToPost={{action "replyToPost"}} />
+          <TopicFooterButtons @topic={{this.model}} @toggleMultiSelect={{action "toggleMultiSelect"}} @showTopicSlowModeUpdate={{route-action "showTopicSlowModeUpdate"}} @deleteTopic={{action "deleteTopic"}} @recoverTopic={{action "recoverTopic"}} @toggleClosed={{action "toggleClosed"}} @toggleArchived={{action "toggleArchived"}} @toggleVisibility={{action "toggleVisibility"}} @showTopicTimerModal={{route-action "showTopicTimerModal"}} @showFeatureTopic={{route-action "showFeatureTopic"}} @showChangeTimestamp={{route-action "showChangeTimestamp"}} @resetBumpDate={{action "resetBumpDate"}} @convertToPublicTopic={{action "convertToPublicTopic"}} @convertToPrivateMessage={{action "convertToPrivateMessage"}} @toggleBookmark={{action "toggleBookmark"}} @showFlagTopic={{route-action "showFlagTopic"}} @toggleArchiveMessage={{action "toggleArchiveMessage"}} @editFirstPost={{action "editFirstPost"}} @deferTopic={{action "deferTopic"}} @replyToPost={{action "replyToPost"}} />
         {{else}}
           <div id="topic-footer-buttons">
             <DButton @icon="reply" @class="btn-primary pull-right" @action={{route-action "showLogin"}} @label="topic.reply.title" />
@@ -205,37 +205,37 @@
         {{/if}}
       {{/if}}
 
-      <PluginOutlet @name="topic-above-suggested" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
-      <div class="{{if model.relatedMessages.length "related-messages-wrapper"}} {{if model.suggestedTopics.length "suggested-topics-wrapper"}}">
-        {{#if model.relatedMessages.length}}
-          <RelatedMessages @topic={{model}} />
+      <PluginOutlet @name="topic-above-suggested" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
+      <div class="{{if this.model.relatedMessages.length "related-messages-wrapper"}} {{if this.model.suggestedTopics.length "suggested-topics-wrapper"}}">
+        {{#if this.model.relatedMessages.length}}
+          <RelatedMessages @topic={{this.model}} />
         {{/if}}
-        {{#if model.suggestedTopics.length}}
-          <SuggestedTopics @topic={{model}} />
+        {{#if this.model.suggestedTopics.length}}
+          <SuggestedTopics @topic={{this.model}} />
         {{/if}}
       </div>
     {{/if}}
   {{else}}
     <div class="container">
-      <ConditionalLoadingSpinner @condition={{noErrorYet}}>
-        {{#if model.errorHtml}}
-          <div class="not-found">{{html-safe model.errorHtml}}</div>
+      <ConditionalLoadingSpinner @condition={{this.noErrorYet}}>
+        {{#if this.model.errorHtml}}
+          <div class="not-found">{{html-safe this.model.errorHtml}}</div>
         {{else}}
           <div class="topic-error">
-            <div>{{model.errorMessage}}</div>
-            {{#if model.noRetry}}
-              {{#unless currentUser}}
+            <div>{{this.model.errorMessage}}</div>
+            {{#if this.model.noRetry}}
+              {{#unless this.currentUser}}
                 <DButton @action={{route-action "showLogin"}} @class="btn-primary topic-retry" @icon="user" @label="log_in" />
               {{/unless}}
             {{else}}
               <DButton @action={{action "retryLoading"}} @class="btn-primary topic-retry" @icon="sync" @label="errors.buttons.again" />
             {{/if}}
           </div>
-          <ConditionalLoadingSpinner @condition={{retrying}} />
+          <ConditionalLoadingSpinner @condition={{this.retrying}} />
         {{/if}}
       </ConditionalLoadingSpinner>
     </div>
   {{/if}}
 
-  <QuoteButton @quoteState={{quoteState}} @selectText={{action "selectText"}} @editPost={{action "editPost"}} @topic={{model}} @composerVisible={{composer.visible}} />
+  <QuoteButton @quoteState={{this.quoteState}} @selectText={{action "selectText"}} @editPost={{action "editPost"}} @topic={{this.model}} @composerVisible={{this.composer.visible}} />
 </DiscourseTopic>
diff --git a/app/assets/javascripts/discourse/app/templates/unknown.hbs b/app/assets/javascripts/discourse/app/templates/unknown.hbs
index 168cdc06d56..88be51824bf 100644
--- a/app/assets/javascripts/discourse/app/templates/unknown.hbs
+++ b/app/assets/javascripts/discourse/app/templates/unknown.hbs
@@ -1,3 +1,3 @@
 <div class="container">
-  {{html-safe model}}
+  {{html-safe this.model}}
 </div>
diff --git a/app/assets/javascripts/discourse/app/templates/user-card.hbs b/app/assets/javascripts/discourse/app/templates/user-card.hbs
index 16abdbbe714..ba2df96cac1 100644
--- a/app/assets/javascripts/discourse/app/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-card.hbs
@@ -1,7 +1,7 @@
-{{#if site.mobileView}}
+{{#if this.site.mobileView}}
   <div class="card-cloak hidden"></div>
 {{/if}}
 
-<UserCardContents @topic={{topic.model}} @showUser={{action "showUser"}} @filterPosts={{action "filterPosts"}} @composePrivateMessage={{route-action "composePrivateMessage"}} @createNewMessageViaParams={{route-action "createNewMessageViaParams"}} />
+<UserCardContents @topic={{this.topic.model}} @showUser={{action "showUser"}} @filterPosts={{action "filterPosts"}} @composePrivateMessage={{route-action "composePrivateMessage"}} @createNewMessageViaParams={{route-action "createNewMessageViaParams"}} />
 
-<GroupCardContents @topic={{topic.model}} @showUser={{action "showUser"}} @showGroup={{action "showGroup"}} @createNewMessageViaParams={{route-action "createNewMessageViaParams"}} />
+<GroupCardContents @topic={{this.topic.model}} @showUser={{action "showUser"}} @showGroup={{action "showGroup"}} @createNewMessageViaParams={{route-action "createNewMessageViaParams"}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
index 714209863b3..90920e9db92 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited-show.hbs
@@ -1,24 +1,24 @@
 <DSection @pageClass="user-invites" @tagName="">
-  {{#if canInviteToForum}}
+  {{#if this.canInviteToForum}}
     <LoadMore @class="user-content" @selector=".user-invite-list tr" @action={{action "loadMore"}}>
       <DSection @class="user-additional-controls">
-        {{#if showSearch}}
+        {{#if this.showSearch}}
           <div class="user-invite-search">
-            <form><TextField @value={{searchTerm}} @placeholderKey="user.invited.search" /></form>
+            <form><TextField @value={{this.searchTerm}} @placeholderKey="user.invited.search" /></form>
           </div>
         {{/if}}
         <DSection @class="user-invite-buttons">
           <DButton @class="btn-default" @icon="plus" @action={{action "createInvite"}} @label="user.invited.create" />
-          {{#if canBulkInvite}}
-            {{#if siteSettings.allow_bulk_invite}}
-              {{#unless site.mobileView}}
+          {{#if this.canBulkInvite}}
+            {{#if this.siteSettings.allow_bulk_invite}}
+              {{#unless this.site.mobileView}}
                 <DButton @class="btn-flat" @icon="upload" @action={{action "createInviteCsv"}} @label="user.invited.bulk_invite.text" />
               {{/unless}}
             {{/if}}
           {{/if}}
-          {{#if showBulkActionButtons}}
-            {{#if inviteExpired}}
-              {{#if removedAll}}
+          {{#if this.showBulkActionButtons}}
+            {{#if this.inviteExpired}}
+              {{#if this.removedAll}}
                 <span class="removed-all">
                   {{i18n "user.invited.removed_all"}}
                 </span>
@@ -27,12 +27,12 @@
               {{/if}}
             {{/if}}
 
-            {{#if invitePending}}
-              {{#if reinvitedAll}}
+            {{#if this.invitePending}}
+              {{#if this.reinvitedAll}}
                 <span class="reinvited-all">
                   <DButton @icon="check" @disabled={{true}} @label="user.invited.reinvited_all" />
                 </span>
-              {{else if hasEmailInvites}}
+              {{else if this.hasEmailInvites}}
                 <DButton @class="btn-default" @icon="sync" @action={{action "reinviteAll"}} @label="user.invited.reinvite_all" />
               {{/if}}
             {{/if}}
@@ -40,14 +40,14 @@
         </DSection>
       </DSection>
       <section>
-        {{#if model.invites}}
-          {{#if inviteRedeemed}}
+        {{#if this.model.invites}}
+          {{#if this.inviteRedeemed}}
             <table class="table user-invite-list">
               <thead>
                 <tr>
                   <th>{{i18n "user.invited.user"}}</th>
                   <th>{{i18n "user.invited.redeemed_at"}}</th>
-                  {{#if model.can_see_invite_details}}
+                  {{#if this.model.can_see_invite_details}}
                     <th>{{i18n "user.last_seen"}}</th>
                     <th>{{i18n "user.invited.topics_entered"}}</th>
                     <th>{{i18n "user.invited.posts_read_count"}}</th>
@@ -58,14 +58,14 @@
                 </tr>
               </thead>
               <tbody>
-                {{#each model.invites as |invite|}}
+                {{#each this.model.invites as |invite|}}
                   <tr>
                     <td>
                       <LinkTo @route="user" @model={{invite.user}}>{{avatar invite.user imageSize="tiny"}}</LinkTo>
                       <LinkTo @route="user" @model={{invite.user}}>{{invite.user.username}}</LinkTo>
                     </td>
                     <td>{{format-date invite.redeemed_at}}</td>
-                    {{#if model.can_see_invite_details}}
+                    {{#if this.model.can_see_invite_details}}
                       <td>{{format-date invite.user.last_seen_at}}</td>
                       <td>{{number invite.user.topics_entered}}</td>
                       <td>{{number invite.user.posts_read_count}}</td>
@@ -92,7 +92,7 @@
                 </tr>
               </thead>
               <tbody>
-                {{#each model.invites as |invite|}}
+                {{#each this.model.invites as |invite|}}
                   <tr>
                     <td class="invite-type">
                       <div class="label">{{i18n "user.invited.invited_via"}}</div>
@@ -118,7 +118,7 @@
 
                     <td class="invite-expires-at">
                       <div class="label">{{i18n "user.invited.expires_at"}}</div>
-                      {{#if inviteExpired}}
+                      {{#if this.inviteExpired}}
                         {{raw-date invite.expires_at}}
                       {{else if invite.expired}}
                         {{i18n "user.invited.expired"}}
@@ -137,10 +137,10 @@
             </table>
           {{/if}}
 
-          <ConditionalLoadingSpinner @condition={{invitesLoading}} />
+          <ConditionalLoadingSpinner @condition={{this.invitesLoading}} />
         {{else}}
           <div class="user-invite-none">
-            {{#if canBulkInvite}}
+            {{#if this.canBulkInvite}}
               {{html-safe (i18n "user.invited.bulk_invite.none")}}
             {{else}}
               {{i18n "user.invited.none"}}
@@ -151,7 +151,7 @@
     </LoadMore>
   {{else}}
     <div class="alert alert-error invite-error">
-      {{model.error}}
+      {{this.model.error}}
     </div>
   {{/if}}
 </DSection>
diff --git a/app/assets/javascripts/discourse/app/templates/user-invited.hbs b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
index 783c130bd6a..4f33488b3aa 100644
--- a/app/assets/javascripts/discourse/app/templates/user-invited.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-invited.hbs
@@ -1,9 +1,9 @@
-{{#if can_see_invite_details}}
+{{#if this.can_see_invite_details}}
   <DSection @class="user-secondary-navigation" @pageClass="user-invites">
     <MobileNav @class="invites-nav" @desktopClass="nav-stacked action-list">
-      <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{pendingLabel}} />
-      <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{expiredLabel}} />
-      <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{redeemedLabel}} />
+      <NavItem @route="userInvited.show" @routeParam="pending" @i18nLabel={{this.pendingLabel}} />
+      <NavItem @route="userInvited.show" @routeParam="expired" @i18nLabel={{this.expiredLabel}} />
+      <NavItem @route="userInvited.show" @routeParam="redeemed" @i18nLabel={{this.redeemedLabel}} />
     </MobileNav>
   </DSection>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
index 3d8233bf035..e4d7d361b42 100644
--- a/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-private-messages-tags.hbs
@@ -6,12 +6,12 @@
 
 <div class="tag-sort-options">
   {{i18n "tagging.sort_by"}}
-  <span class="tag-sort-count {{if sortedByCount "active"}}">
+  <span class="tag-sort-count {{if this.sortedByCount "active"}}">
     <a href {{action "sortByCount"}}>
       {{i18n "tagging.sort_by_count"}}
     </a>
   </span>
-  <span class="tag-sort-name {{if sortedByName "active"}}">
+  <span class="tag-sort-name {{if this.sortedByName "active"}}">
     <a href {{action "sortById"}}>
       {{i18n "tagging.sort_by_name"}}
     </a>
@@ -20,6 +20,6 @@
 
 <hr>
 
-{{#if model}}
-  <TagList @tags={{model}} @sortProperties={{sortProperties}} @titleKey="tagging.all_tags" @isPrivateMessage={{true}} @tagsForUser={{tagsForUser}} />
+{{#if this.model}}
+  <TagList @tags={{this.model}} @sortProperties={{this.sortProperties}} @titleKey="tagging.all_tags" @isPrivateMessage={{true}} @tagsForUser={{this.tagsForUser}} />
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
index 38320de86ef..dc086f0c10c 100644
--- a/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user-topics-list.hbs
@@ -1,24 +1,24 @@
-{{#if noContent}}
+{{#if this.noContent}}
   <EmptyState
-    @title={{model.emptyState.title}}
-    @body={{model.emptyState.body}}
+    @title={{this.model.emptyState.title}}
+    @body={{this.model.emptyState.body}}
   />
 {{else}}
   <LoadMore @class="paginated-topics-list" @selector=".paginated-topics-list .topic-list .topic-list-item" @action={{action "loadMore"}}>
-    <TopicDismissButtons @position="top" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+    <TopicDismissButtons @position="top" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-    {{#if (gt incomingCount 0)}}
+    {{#if (gt this.incomingCount 0)}}
       <div class="show-mores">
         <a tabindex="0" href {{action "showInserted"}} class="alert alert-info clickable">
-          <CountI18n @key="topic_count_" @suffix="latest" @count={{incomingCount}} />
+          <CountI18n @key="topic_count_" @suffix="latest" @count={{this.incomingCount}} />
         </a>
       </div>
     {{/if}}
 
-    <BasicTopicList @topicList={{model}} @hideCategory={{hideCategory}} @showPosters={{showPosters}} @bulkSelectEnabled={{bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @selected={{selected}} @tagsForUser={{tagsForUser}} @onScroll={{saveScrollPosition}} @canBulkSelect={{canBulkSelect}} @scrollOnLoad={{true}} @toggleBulkSelect={{action "toggleBulkSelect"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} />
+    <BasicTopicList @topicList={{this.model}} @hideCategory={{this.hideCategory}} @showPosters={{this.showPosters}} @bulkSelectEnabled={{this.bulkSelectEnabled}} @bulkSelectAction={{action "refresh"}} @selected={{this.selected}} @tagsForUser={{this.tagsForUser}} @onScroll={{this.saveScrollPosition}} @canBulkSelect={{this.canBulkSelect}} @scrollOnLoad={{true}} @toggleBulkSelect={{action "toggleBulkSelect"}} @updateAutoAddTopicsToBulkSelect={{action "updateAutoAddTopicsToBulkSelect"}} />
 
-    <TopicDismissButtons @position="bottom" @selectedTopics={{selected}} @model={{model}} @showResetNew={{showResetNew}} @showDismissRead={{showDismissRead}} @resetNew={{action "resetNew"}} />
+    <TopicDismissButtons @position="bottom" @selectedTopics={{this.selected}} @model={{this.model}} @showResetNew={{this.showResetNew}} @showDismissRead={{this.showDismissRead}} @resetNew={{action "resetNew"}} />
 
-    <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+    <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
   </LoadMore>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user.hbs b/app/assets/javascripts/discourse/app/templates/user.hbs
index 88577a3c47c..c728f78cb46 100644
--- a/app/assets/javascripts/discourse/app/templates/user.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user.hbs
@@ -1,77 +1,77 @@
-<PluginOutlet @name="above-user-profile" @connectorTagName="div" @args={{hash model=model}} />
-<div class="container {{if viewingSelf "viewing-self"}} {{if model.profile_hidden "profile-hidden"}} {{primaryGroup}}">
+<PluginOutlet @name="above-user-profile" @connectorTagName="div" @args={{hash model=this.model}} />
+<div class="container {{if this.viewingSelf "viewing-self"}} {{if this.model.profile_hidden "profile-hidden"}} {{this.primaryGroup}}">
   <DSection @class="user-main">
-    <section class="{{if collapsedInfo "collapsed-info"}} about {{if hasProfileBackgroundUrl "has-background" "no-background"}}" >
-      {{#unless collapsedInfo}}
-        {{#if showStaffCounters}}
+    <section class="{{if this.collapsedInfo "collapsed-info"}} about {{if this.hasProfileBackgroundUrl "has-background" "no-background"}}" >
+      {{#unless this.collapsedInfo}}
+        {{#if this.showStaffCounters}}
           <div class="staff-counters">
-            {{#if model.number_of_flags_given}}
-              <div><span class="helpful-flags">{{model.number_of_flags_given}}</span>{{i18n "user.staff_counters.flags_given"}}</div>
+            {{#if this.model.number_of_flags_given}}
+              <div><span class="helpful-flags">{{this.model.number_of_flags_given}}</span>{{i18n "user.staff_counters.flags_given"}}</div>
             {{/if}}
-            {{#if model.number_of_flagged_posts}}
+            {{#if this.model.number_of_flagged_posts}}
               <div>
-                <LinkTo @route="review" @query={{hash username=model.username status="all" type="ReviewableFlaggedPost"}}>
-                  <span class="flagged-posts">{{model.number_of_flagged_posts}}</span>{{i18n "user.staff_counters.flagged_posts"}}
+                <LinkTo @route="review" @query={{hash username=this.model.username status="all" type="ReviewableFlaggedPost"}}>
+                  <span class="flagged-posts">{{this.model.number_of_flagged_posts}}</span>{{i18n "user.staff_counters.flagged_posts"}}
                 </LinkTo>
               </div>
             {{/if}}
-            {{#if model.number_of_rejected_posts}}
+            {{#if this.model.number_of_rejected_posts}}
               <div>
-                <LinkTo @route="review" @query={{hash username=model.username status="rejected" type="ReviewableQueuedPost"}}>
-                  <span class="flagged-posts">{{model.number_of_rejected_posts}}</span>{{i18n "user.staff_counters.rejected_posts"}}
+                <LinkTo @route="review" @query={{hash username=this.model.username status="rejected" type="ReviewableQueuedPost"}}>
+                  <span class="flagged-posts">{{this.model.number_of_rejected_posts}}</span>{{i18n "user.staff_counters.rejected_posts"}}
                 </LinkTo>
               </div>
             {{/if}}
 
-            {{#if model.number_of_deleted_posts}}
+            {{#if this.model.number_of_deleted_posts}}
               <div>
-                <LinkTo @route="user.deletedPosts" @model={{model}}>
-                  <span class="deleted-posts">{{model.number_of_deleted_posts}}</span>{{i18n "user.staff_counters.deleted_posts"}}
+                <LinkTo @route="user.deletedPosts" @model={{this.model}}>
+                  <span class="deleted-posts">{{this.model.number_of_deleted_posts}}</span>{{i18n "user.staff_counters.deleted_posts"}}
                 </LinkTo>
               </div>
             {{/if}}
-            {{#if model.number_of_suspensions}}
+            {{#if this.model.number_of_suspensions}}
               <div>
                 <a href {{action "showSuspensions"}}>
-                  <span class="suspensions">{{model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
+                  <span class="suspensions">{{this.model.number_of_suspensions}}</span>{{i18n "user.staff_counters.suspensions"}}
                 </a>
               </div>
             {{/if}}
-            {{#if model.warnings_received_count}}
+            {{#if this.model.warnings_received_count}}
               <div>
-                <LinkTo @route="userPrivateMessages.warnings" @model={{model}}>
-                  <span class="warnings-received">{{model.warnings_received_count}}</span>{{i18n "user.staff_counters.warnings_received"}}
+                <LinkTo @route="userPrivateMessages.warnings" @model={{this.model}}>
+                  <span class="warnings-received">{{this.model.warnings_received_count}}</span>{{i18n "user.staff_counters.warnings_received"}}
                 </LinkTo>
               </div>
             {{/if}}
           </div>
         {{/if}}
-        <div class="user-profile-image" style={{model.profileBackgroundUrl}}></div>
+        <div class="user-profile-image" style={{this.model.profileBackgroundUrl}}></div>
       {{/unless}}
       <div class="details">
         <div class="primary">
-          <PluginOutlet @name="before-user-profile-avatar" @args={{hash model=model}} />
-          <UserProfileAvatar @user={{model}} @tagName="" />
+          <PluginOutlet @name="before-user-profile-avatar" @args={{hash model=this.model}} />
+          <UserProfileAvatar @user={{this.model}} @tagName="" />
           <section class="controls">
             <ul>
-              {{#if model.can_send_private_message_to_user}}
+              {{#if this.model.can_send_private_message_to_user}}
                 <li>
-                  <DButton @class="btn-primary compose-pm" @action={{route-action "composePrivateMessage" model}} @icon="envelope" @label="user.private_message" />
+                  <DButton @class="btn-primary compose-pm" @action={{route-action "composePrivateMessage" this.model}} @icon="envelope" @label="user.private_message" />
                 </li>
               {{/if}}
-              {{#if canMuteOrIgnoreUser}}
+              {{#if this.canMuteOrIgnoreUser}}
                 <li>
-                  <UserNotificationsDropdown @user={{model}} @value={{userNotificationLevel}} @updateNotificationLevel={{action "updateNotificationLevel"}} />
+                  <UserNotificationsDropdown @user={{this.model}} @value={{this.userNotificationLevel}} @updateNotificationLevel={{action "updateNotificationLevel"}} />
                 </li>
               {{/if}}
-              {{#if currentUser.staff}}
-                <li><a href={{model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}<span class="d-button-label">{{i18n "admin.user.show_admin_profile"}}</span></a></li>
+              {{#if this.currentUser.staff}}
+                <li><a href={{this.model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}<span class="d-button-label">{{i18n "admin.user.show_admin_profile"}}</span></a></li>
               {{/if}}
-              <PluginOutlet @name="user-profile-controls" @connectorTagName="li" @args={{hash model=model}} />
+              <PluginOutlet @name="user-profile-controls" @connectorTagName="li" @args={{hash model=this.model}} />
 
-              {{#if canExpandProfile}}
+              {{#if this.canExpandProfile}}
                 <li>
-                  <DButton @ariaExpanded={{collapsedInfoState.isExpanded}} @ariaLabel={{collapsedInfoState.ariaLabel}} @ariaControls="collapsed-info-panel" @class="btn-default" @label={{concat "user." collapsedInfoState.label}} @icon={{collapsedInfoState.icon}} @action={{action collapsedInfoState.action}} />
+                  <DButton @ariaExpanded={{this.collapsedInfoState.isExpanded}} @ariaLabel={{this.collapsedInfoState.ariaLabel}} @ariaControls="collapsed-info-panel" @class="btn-default" @label={{concat "user." this.collapsedInfoState.label}} @icon={{this.collapsedInfoState.icon}} @action={{action this.collapsedInfoState.action}} />
                 </li>
               {{/if}}
             </ul>
@@ -79,67 +79,67 @@
 
           <div class="primary-textual">
             <div class="user-profile-names">
-              <h1 class={{if nameFirst "full-name" "username"}}>{{if nameFirst model.name (format-username model.username)}} {{user-status model currentUser=currentUser}}</h1>
-              <h2 class={{if nameFirst "username" "full-name"}}>{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
-              {{#if model.staged}}
+              <h1 class={{if this.nameFirst "full-name" "username"}}>{{if this.nameFirst this.model.name (format-username this.model.username)}} {{user-status this.model currentUser=this.currentUser}}</h1>
+              <h2 class={{if this.nameFirst "username" "full-name"}}>{{#if this.nameFirst}}{{this.model.username}}{{else}}{{this.model.name}}{{/if}}</h2>
+              {{#if this.model.staged}}
                 <h2 class="staged">{{i18n "user.staged"}}</h2>
               {{/if}}
-              {{#if model.title}}
-                <h3>{{model.title}}</h3>
+              {{#if this.model.title}}
+                <h3>{{this.model.title}}</h3>
               {{/if}}
-              <PluginOutlet @name="user-post-names" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+              <PluginOutlet @name="user-post-names" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
             </div>
 
-            {{#if showFeaturedTopic}}
+            {{#if this.showFeaturedTopic}}
               <h3 class="featured-topic">
                 <span>{{i18n "user.featured_topic"}}</span>
-                <LinkTo @route="topic" @models={{array model.featured_topic.slug model.featured_topic.id}}>{{html-safe (replace-emoji model.featured_topic.fancy_title)}}</LinkTo>
+                <LinkTo @route="topic" @models={{array this.model.featured_topic.slug this.model.featured_topic.id}}>{{html-safe (replace-emoji this.model.featured_topic.fancy_title)}}</LinkTo>
               </h3>
             {{/if}}
 
             <h3 class="location-and-website">
-              {{#if model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{model.location}}</div>{{/if}}
-              {{#if model.website_name}}
+              {{#if this.model.location}}<div class="user-profile-location">{{d-icon "map-marker-alt"}} {{this.model.location}}</div>{{/if}}
+              {{#if this.model.website_name}}
                 <div class="user-profile-website">
                   {{d-icon "globe"}}
-                  {{#if linkWebsite}}
+                  {{#if this.linkWebsite}}
                     {{!-- template-lint-disable  --}}
-                    <a href={{model.website}} rel="noopener {{unless removeNoFollow 'nofollow ugc'}}" target="_blank">{{model.website_name}}</a>
+                    <a href={{this.model.website}} rel="noopener {{unless this.removeNoFollow 'nofollow ugc'}}" target="_blank">{{this.model.website_name}}</a>
                   {{else}}
-                    <span title={{model.website}}>{{model.website_name}}</span>
+                    <span title={{this.model.website}}>{{this.model.website_name}}</span>
                   {{/if}}
                 </div>
               {{/if}}
-              <PluginOutlet @name="user-location-and-website" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+              <PluginOutlet @name="user-location-and-website" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
             </h3>
 
             <div class='bio'>
-              {{#if model.suspended}}
+              {{#if this.model.suspended}}
                 <div class='suspended'>
                   {{d-icon "ban"}}
                   <b>
-                    {{#if model.suspendedForever}}
+                    {{#if this.model.suspendedForever}}
                       {{i18n 'user.suspended_permanently'}}
                     {{else}}
-                      {{i18n 'user.suspended_notice' date=model.suspendedTillDate}}
+                      {{i18n 'user.suspended_notice' date=this.model.suspendedTillDate}}
                     {{/if}}
                   </b>
                   <br>
-                  {{#if model.suspend_reason}}
-                    <b>{{i18n 'user.suspended_reason'}}</b> {{model.suspend_reason}}
+                  {{#if this.model.suspend_reason}}
+                    <b>{{i18n 'user.suspended_reason'}}</b> {{this.model.suspend_reason}}
                   {{/if}}
                 </div>
               {{/if}}
-              {{#if isNotSuspendedOrIsStaff}}
+              {{#if this.isNotSuspendedOrIsStaff}}
                 <HtmlWithLinks>
-                  {{html-safe model.bio_cooked}}
+                  {{html-safe this.model.bio_cooked}}
                 </HtmlWithLinks>
               {{/if}}
             </div>
 
-            {{#if publicUserFields}}
+            {{#if this.publicUserFields}}
               <div class="public-user-fields">
-                {{#each publicUserFields as |uf|}}
+                {{#each this.publicUserFields as |uf|}}
                   {{#if uf.value}}
                     <div class="public-user-field {{uf.field.dasherized_name}}">
                       <span class="user-field-name">{{uf.field.name}}</span>:
@@ -154,66 +154,66 @@
                   {{/if}}
                 {{/each}}
 
-                <PluginOutlet @name="user-profile-public-fields" @tagName="span" @connectorTagName="div" @args={{hash publicUserFields=publicUserFields
-                                      model=model}} />
+                <PluginOutlet @name="user-profile-public-fields" @tagName="span" @connectorTagName="div" @args={{hash publicUserFields=this.publicUserFields
+                                      model=this.model}} />
               </div>
             {{/if}}
 
-            <PluginOutlet @name="user-profile-primary" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+            <PluginOutlet @name="user-profile-primary" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
           </div>
         </div>
-        <PluginOutlet @name="user-profile-above-collapsed-info" @args={{hash model=model collapsedInfo=collapsedInfo}} />
-        {{#unless collapsedInfo}}
+        <PluginOutlet @name="user-profile-above-collapsed-info" @args={{hash model=this.model collapsedInfo=this.collapsedInfo}} />
+        {{#unless this.collapsedInfo}}
           <div class='secondary' id='collapsed-info-panel'>
             <dl>
-              {{#if model.created_at}}
-                <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date model.created_at}}</dd></div>
+              {{#if this.model.created_at}}
+                <div><dt>{{i18n 'user.created'}}</dt><dd>{{bound-date this.model.created_at}}</dd></div>
               {{/if}}
-              {{#if model.last_posted_at}}
-                <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date model.last_posted_at}}</dd></div>
+              {{#if this.model.last_posted_at}}
+                <div><dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date this.model.last_posted_at}}</dd></div>
               {{/if}}
-              {{#if model.last_seen_at}}
-                <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date model.last_seen_at}}</dd></div>
+              {{#if this.model.last_seen_at}}
+                <div><dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date this.model.last_seen_at}}</dd></div>
               {{/if}}
-              {{#if model.profile_view_count}}
-                <div><dt>{{i18n 'views'}}</dt><dd>{{model.profile_view_count}}</dd></div>
+              {{#if this.model.profile_view_count}}
+                <div><dt>{{i18n 'views'}}</dt><dd>{{this.model.profile_view_count}}</dd></div>
               {{/if}}
-              {{#if model.invited_by}}
-                <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by"><LinkTo @route="user" @model={{model.invited_by}}>{{model.invited_by.username}}</LinkTo></dd></div>
+              {{#if this.model.invited_by}}
+                <div><dt class="invited-by">{{i18n 'user.invited_by'}}</dt><dd class="invited-by"><LinkTo @route="user" @model={{this.model.invited_by}}>{{this.model.invited_by.username}}</LinkTo></dd></div>
               {{/if}}
-              {{#if model.trust_level}}
-                <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{model.trustLevel.name}}</dd></div>
+              {{#if this.model.trust_level}}
+                <div><dt class="trust-level">{{i18n 'user.trust_level'}}</dt><dd class="trust-level">{{this.model.trustLevel.name}}</dd></div>
               {{/if}}
-              {{#if canCheckEmails}}
+              {{#if this.canCheckEmails}}
                 <div><dt>{{i18n 'user.email.title'}}</dt>
-                <dd title={{model.email}}>
-                  {{#if model.email}}
-                    {{model.email}}
+                <dd title={{this.model.email}}>
+                  {{#if this.model.email}}
+                    {{this.model.email}}
                   {{else}}
-                    <DButton @action={{route-action "checkEmail"}} @actionParam={{model}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
+                    <DButton @action={{route-action "checkEmail"}} @actionParam={{this.model}} @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
                   {{/if}}
                 </dd>
                 </div>
               {{/if}}
-              {{#if model.displayGroups}}
-                <div><dt class="groups">{{i18n 'groups.title' count=model.displayGroups.length}}</dt>
+              {{#if this.model.displayGroups}}
+                <div><dt class="groups">{{i18n 'groups.title' count=this.model.displayGroups.length}}</dt>
                 <dd class='groups'>
-                  {{#each model.displayGroups as |group|}}
+                  {{#each this.model.displayGroups as |group|}}
                     <span><LinkTo @route="group" @model={{group.name}} class="group-link">{{group.name}}</LinkTo></span>
                   {{/each}}
 
-                  <LinkTo @route="groups" @query={{hash username=model.username}}>
+                  <LinkTo @route="groups" @query={{hash username=this.model.username}}>
                     ...
                   </LinkTo>
                 </dd>
                 </div>
               {{/if}}
 
-              {{#if canDeleteUser}}
+              {{#if this.canDeleteUser}}
                 <div class='pull-right'><DButton @action={{action "adminDelete"}} @icon="exclamation-triangle" @label="user.admin_delete" @class="btn-danger" /></div>
               {{/if}}
             </dl>
-            <PluginOutlet @name="user-profile-secondary" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+            <PluginOutlet @name="user-profile-secondary" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
           </div>
         {{/unless}}
       </div>
@@ -221,28 +221,28 @@
     <div class='user-content-wrapper'>
       <section class="user-primary-navigation">
         <MobileNav @class="main-nav" @desktopClass="nav nav-pills user-nav">
-          {{#unless model.profile_hidden}}
+          {{#unless this.model.profile_hidden}}
             <li class="summary"><LinkTo @route="user.summary">{{i18n 'user.summary.title'}}</LinkTo></li>
             <li class="activity"><LinkTo @route="userActivity">{{i18n 'user.activity_stream'}}</LinkTo></li>
           {{/unless}}
-          {{#if showNotificationsTab}}
+          {{#if this.showNotificationsTab}}
             <li class="user-notifications">
               <LinkTo @route="userNotifications">
                 {{d-icon "comment" class="glyph"}}{{i18n 'user.notifications'}}
               </LinkTo>
             </li>
           {{/if}}
-          {{#if showPrivateMessages}}
+          {{#if this.showPrivateMessages}}
             <li class="private-messages"><LinkTo @route="userPrivateMessages">{{d-icon "far-envelope"}}{{i18n 'user.private_messages'}}</LinkTo></li>
           {{/if}}
-          {{#if canInviteToForum}}
+          {{#if this.canInviteToForum}}
             <li class="invited"><LinkTo @route="userInvited">{{d-icon "user-plus"}}{{i18n 'user.invited.title'}}</LinkTo></li>
           {{/if}}
-          {{#if showBadges}}
+          {{#if this.showBadges}}
             <li class="badges"><LinkTo @route="user.badges">{{d-icon "certificate"}}{{i18n 'badges.title'}}</LinkTo></li>
           {{/if}}
-          <PluginOutlet @name="user-main-nav" @tagName="span" @connectorTagName="div" @tagName="" @connectorTagName="li" @args={{hash model=model}} />
-          {{#if model.can_edit}}
+          <PluginOutlet @name="user-main-nav" @tagName="span" @connectorTagName="div" @tagName="" @connectorTagName="li" @args={{hash model=this.model}} />
+          {{#if this.model.can_edit}}
             <li class="preferences"><LinkTo @route="preferences">{{d-icon "cog"}}{{i18n 'user.preferences'}}</LinkTo></li>
           {{/if}}
         </MobileNav>
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index 1ab5ded3e8f..5709d95e79d 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -5,35 +5,35 @@
       <DNavigationItem @route="userActivity.topics">{{i18n "user_action_groups.4"}}</DNavigationItem>
       <DNavigationItem @route="userActivity.replies">{{i18n "user_action_groups.5"}}</DNavigationItem>
 
-      {{#if user.showRead}}
+      {{#if this.user.showRead}}
         <DNavigationItem @route="userActivity.read" @title={{i18n "user.read_help"}}>
           {{i18n "user.read"}}
         </DNavigationItem>
       {{/if}}
 
-      {{#if user.showDrafts}}
+      {{#if this.user.showDrafts}}
         <DNavigationItem @route="userActivity.drafts">
-          {{draftLabel}}
+          {{this.draftLabel}}
         </DNavigationItem>
       {{/if}}
 
-      {{#if (gt model.pending_posts_count 0)}}
+      {{#if (gt this.model.pending_posts_count 0)}}
         <DNavigationItem @route="userActivity.pending">
-          {{pendingLabel}}
+          {{this.pendingLabel}}
         </DNavigationItem>
       {{/if}}
 
       <DNavigationItem @route="userActivity.likesGiven">{{i18n "user_action_groups.1"}}</DNavigationItem>
 
-      {{#if user.showBookmarks}}
+      {{#if this.user.showBookmarks}}
         <DNavigationItem @route="userActivity.bookmarks">{{i18n "user_action_groups.3"}}</DNavigationItem>
       {{/if}}
 
-      <PluginOutlet @name="user-activity-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=model}} />
+      <PluginOutlet @name="user-activity-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
     </MobileNav>
   </nav>
 </DSection>
-{{#if canDownloadPosts}}
+{{#if this.canDownloadPosts}}
   <section class="user-additional-controls">
     <DButton @action={{action "exportUserArchive"}} @class="btn-default" @label="user.download_archive.button_text" @icon="download" />
   </section>
diff --git a/app/assets/javascripts/discourse/app/templates/user/badges.hbs b/app/assets/javascripts/discourse/app/templates/user/badges.hbs
index b6bffb1403b..1d7e1b17756 100644
--- a/app/assets/javascripts/discourse/app/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/badges.hbs
@@ -1,12 +1,12 @@
 <DSection @pageClass="user-badges" @class="user-content">
   <p class="favorite-count">
-    {{i18n "badges.favorite_count" count=this.favoriteBadges.length max=siteSettings.max_favorite_badges}}
+    {{i18n "badges.favorite_count" count=this.favoriteBadges.length max=this.siteSettings.max_favorite_badges}}
   </p>
 
   <div class="badge-group-list">
-    {{#each sortedBadges as |ub|}}
-      <BadgeCard @badge={{ub.badge}} @count={{ub.count}} @canFavorite={{ub.can_favorite}} @isFavorite={{ub.is_favorite}} @username={{username}} @canFavoriteMoreBadges={{canFavoriteMoreBadges}} @onFavoriteClick={{action "favorite" ub}} @filterUser="true" />
+    {{#each this.sortedBadges as |ub|}}
+      <BadgeCard @badge={{ub.badge}} @count={{ub.count}} @canFavorite={{ub.can_favorite}} @isFavorite={{ub.is_favorite}} @username={{this.username}} @canFavoriteMoreBadges={{this.canFavoriteMoreBadges}} @onFavoriteClick={{action "favorite" ub}} @filterUser="true" />
     {{/each}}
-    <PluginOutlet @name="after-user-profile-badges" @args={{hash user=user.model}} />
+    <PluginOutlet @name="after-user-profile-badges" @args={{hash user=this.user.model}} />
   </div>
 </DSection>
diff --git a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
index 43699404483..169947cd165 100644
--- a/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/bookmarks.hbs
@@ -1,20 +1,20 @@
-<ConditionalLoadingSpinner @condition={{loading}}>
-  {{#if permissionDenied}}
+<ConditionalLoadingSpinner @condition={{this.loading}}>
+  {{#if this.permissionDenied}}
     <div class="alert alert-info">{{i18n "bookmarks.list_permission_denied"}}</div>
-  {{else if userDoesNotHaveBookmarks}}
+  {{else if this.userDoesNotHaveBookmarks}}
     <EmptyState
       @title={{i18n "user.no_bookmarks_title"}}
-      @body={{emptyStateBody}}
+      @body={{this.emptyStateBody}}
     />
   {{else}}
     <div class="inline-form full-width bookmark-search-form">
-      <Input @type="text" @value={{searchTerm}} placeholder={{i18n "bookmarks.search_placeholder"}} @enter={{action "search"}} @id="bookmark-search" @autocomplete="off" />
+      <Input @type="text" @value={{this.searchTerm}} placeholder={{i18n "bookmarks.search_placeholder"}} @enter={{action "search"}} @id="bookmark-search" @autocomplete="off" />
       <DButton @class="btn-primary" @action={{action "search"}} @type="button" @icon="search" />
     </div>
-    {{#if nothingFound}}
+    {{#if this.nothingFound}}
       <div class="alert alert-info">{{i18n "user.no_bookmarks_search"}}</div>
     {{else}}
-      <BookmarkList @loadMore={{action "loadMore"}} @reload={{action "reload"}} @loadingMore={{loadingMore}} @content={{model.bookmarks}} />
+      <BookmarkList @loadMore={{action "loadMore"}} @reload={{action "reload"}} @loadingMore={{this.loadingMore}} @content={{this.model.bookmarks}} />
     {{/if}}
   {{/if}}
 </ConditionalLoadingSpinner>
diff --git a/app/assets/javascripts/discourse/app/templates/user/messages.hbs b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
index f8c1cbb2f7f..d86df276e5a 100644
--- a/app/assets/javascripts/discourse/app/templates/user/messages.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/messages.hbs
@@ -1,40 +1,40 @@
 <DSection @class="user-secondary-navigation" @pageClass="user-messages">
   <MobileNav @class="messages-nav" @desktopClass="nav-stacked action-list">
     <li>
-      <LinkTo @route="userPrivateMessages.index" @model={{model}}>
+      <LinkTo @route="userPrivateMessages.index" @model={{this.model}}>
         {{i18n "user.messages.inbox"}}
       </LinkTo>
     </li>
 
-    {{#if isPersonal}}
+    {{#if this.isPersonal}}
       <li class="archive">
-        <LinkTo @route="userPrivateMessages.sent" @model={{model}}>
+        <LinkTo @route="userPrivateMessages.sent" @model={{this.model}}>
           {{i18n "user.messages.sent"}}
         </LinkTo>
       </li>
 
-      {{#if viewingSelf}}
+      {{#if this.viewingSelf}}
         <li class="archive">
-          <LinkTo @route="userPrivateMessages.new" @model={{model}} class="new">
-            {{newLinkText}}
+          <LinkTo @route="userPrivateMessages.new" @model={{this.model}} class="new">
+            {{this.newLinkText}}
           </LinkTo>
         </li>
 
         <li class="archive">
-          <LinkTo @route="userPrivateMessages.unread" @model={{model}} class="unread">
-            {{unreadLinkText}}
+          <LinkTo @route="userPrivateMessages.unread" @model={{this.model}} class="unread">
+            {{this.unreadLinkText}}
           </LinkTo>
         </li>
       {{/if}}
 
       <li class="archive">
-        <LinkTo @route="userPrivateMessages.archive" @model={{model}}>
+        <LinkTo @route="userPrivateMessages.archive" @model={{this.model}}>
           {{i18n "user.messages.archive"}}
         </LinkTo>
       </li>
     {{/if}}
 
-    {{#each model.groups as |group|}}
+    {{#each this.model.groups as |group|}}
       {{#if group.has_messages}}
         <li>
           <LinkTo @route="userPrivateMessages.group" @model={{group.name}}>
@@ -43,17 +43,17 @@
           </LinkTo>
         </li>
 
-        {{#if (and isGroup (eq groupFilter group.name))}}
-          {{#if viewingSelf}}
+        {{#if (and this.isGroup (eq this.groupFilter group.name))}}
+          {{#if this.viewingSelf}}
             <li class="archive">
               <LinkTo @route="userPrivateMessages.groupNew" @model={{group.name}} class="new">
-                {{newLinkText}}
+                {{this.newLinkText}}
               </LinkTo>
             </li>
 
             <li class="archive">
               <LinkTo @route="userPrivateMessages.groupUnread" @model={{group.name}} class="unread">
-                {{unreadLinkText}}
+                {{this.unreadLinkText}}
               </LinkTo>
             </li>
           {{/if}}
@@ -67,33 +67,33 @@
       {{/if}}
     {{/each}}
 
-    {{#if pmTaggingEnabled}}
+    {{#if this.pmTaggingEnabled}}
       <li class="tags">
-        <LinkTo @route="userPrivateMessages.tags" @model={{model}}>
+        <LinkTo @route="userPrivateMessages.tags" @model={{this.model}}>
           {{i18n "user.messages.tags"}}
         </LinkTo>
 
-        {{#if tagId}}
+        {{#if this.tagId}}
           <li class="archive">
-            <LinkTo @route="userPrivateMessages.tagsShow" @model={{tagId}}>
-              {{tagId}}
+            <LinkTo @route="userPrivateMessages.tagsShow" @model={{this.tagId}}>
+              {{this.tagId}}
             </LinkTo>
           </li>
         {{/if}}
       </li>
     {{/if}}
 
-    <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=model}} />
+    <PluginOutlet @name="user-messages-nav" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
   </MobileNav>
 </DSection>
 
-{{#unless site.mobileView}}
+{{#unless this.site.mobileView}}
   <section class="user-additional-controls">
-    {{#if group}}
-      <GroupNotificationsButton @value={{group.group_user.notification_level}} @onChange={{action "changeGroupNotificationLevel"}} />
+    {{#if this.group}}
+      <GroupNotificationsButton @value={{this.group.group_user.notification_level}} @onChange={{action "changeGroupNotificationLevel"}} />
     {{/if}}
 
-    {{#if showNewPM}}
+    {{#if this.showNewPM}}
       <DButton @class="btn-primary new-private-message" @action={{route-action "composePrivateMessage"}} @icon="envelope" @label="user.new_private_message" />
     {{/if}}
   </section>
@@ -101,12 +101,12 @@
 
 <section class="user-content">
   <div class="list-actions">
-    {{#if (and site.mobileView showNewPM)}}
+    {{#if (and this.site.mobileView this.showNewPM)}}
       <DButton @class="btn-primary new-private-message" @action={{route-action "composePrivateMessage"}} @icon="envelope" @label="user.new_private_message" />
     {{/if}}
   </div>
 
-  {{#if showWarningsWarning}}
+  {{#if this.showWarningsWarning}}
     <div class="alert alert-info">{{html-safe (i18n "admin.user.warnings_list_warning")}}</div>
   {{/if}}
 
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
index fbc1be3e8f1..667c87f505b 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications-index.hbs
@@ -1,25 +1,25 @@
-{{#if model.error}}
+{{#if this.model.error}}
   <div class="item error">
-    {{#if model.forbidden}}
+    {{#if this.model.forbidden}}
       {{i18n "errors.reasons.forbidden"}}
     {{else}}
       {{i18n "errors.desc.unknown"}}
     {{/if}}
   </div>
-{{else if doesNotHaveNotifications}}
+{{else if this.doesNotHaveNotifications}}
   <EmptyState
     @title={{i18n "user.no_notifications_page_title"}}
-    @body={{emptyStateBody}}
+    @body={{this.emptyStateBody}}
   />
 {{else}}
   <div class="user-notifications-filter">
-    <NotificationsFilter @value={{filter}} @onChange={{action (mut filter)}} />
+    <NotificationsFilter @value={{this.filter}} @onChange={{action (mut this.filter)}} />
   </div>
 
-  {{#if nothingFound}}
+  {{#if this.nothingFound}}
     <div class="alert alert-info">{{i18n "notifications.empty"}}</div>
   {{else}}
-    <UserNotificationsLarge @notifications={{model}} />
-    <ConditionalLoadingSpinner @condition={{loading}} />
+    <UserNotificationsLarge @notifications={{this.model}} />
+    <ConditionalLoadingSpinner @condition={{this.loading}} />
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
index f626b3522ff..9637395e671 100644
--- a/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/notifications.hbs
@@ -15,7 +15,7 @@
         {{i18n "user_action_groups.2"}}
       </LinkTo>
     </li>
-    {{#if siteSettings.enable_mentions}}
+    {{#if this.siteSettings.enable_mentions}}
       <li>
         <LinkTo @route="userNotifications.mentions">
           {{i18n "user_action_groups.7"}}
@@ -27,20 +27,20 @@
         {{i18n "user_action_groups.11"}}
       </LinkTo>
     </li>
-    <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=model}} />
+    <PluginOutlet @name="user-notifications-bottom" @tagName="span" @connectorTagName="li" @args={{hash model=this.model}} />
   </MobileNav>
 
 </DSection>
 
-{{#if model}}
+{{#if this.model}}
   <section class="user-additional-controls">
-    <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{allNotificationsRead}} />
+    <DButton @title="user.dismiss_notifications_tooltip" @class="btn btn-default dismiss-notifications" @action={{action "resetNew"}} @label="user.dismiss_notifications" @icon="check" @disabled={{this.allNotificationsRead}} />
   </section>
 {{/if}}
 
 <section class="user-content">
   <LoadMore @class="notification-history user-stream" @selector=".user-stream .notification" @action={{action "loadMore"}}>
     {{outlet}}
-    <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+    <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
   </LoadMore>
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/user/posts.hbs b/app/assets/javascripts/discourse/app/templates/user/posts.hbs
index 384e96d0057..ec631cd8c51 100644
--- a/app/assets/javascripts/discourse/app/templates/user/posts.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/posts.hbs
@@ -1 +1 @@
-<UserStream @stream={{model}} />
+<UserStream @stream={{this.model}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user/stream.hbs b/app/assets/javascripts/discourse/app/templates/user/stream.hbs
index 7b5b7247734..90788aa4ef1 100644
--- a/app/assets/javascripts/discourse/app/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/stream.hbs
@@ -1,11 +1,11 @@
-{{#if model.stream.noContent}}
-  {{#if model.isAnotherUsersPage}}
-    <div class="alert alert-info">{{model.emptyStateOthers}}</div>
+{{#if this.model.stream.noContent}}
+  {{#if this.model.isAnotherUsersPage}}
+    <div class="alert alert-info">{{this.model.emptyStateOthers}}</div>
   {{else}}
     <EmptyState
-      @title={{model.emptyState.title}}
-      @body={{model.emptyState.body}}
+      @title={{this.model.emptyState.title}}
+      @body={{this.model.emptyState.body}}
     />
   {{/if}}
 {{/if}}
-<UserStream @stream={{model.stream}} />
+<UserStream @stream={{this.model.stream}} />
diff --git a/app/assets/javascripts/discourse/app/templates/user/summary.hbs b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
index 70bcac97fb6..919ea94f157 100644
--- a/app/assets/javascripts/discourse/app/templates/user/summary.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/summary.hbs
@@ -1,66 +1,66 @@
 <DSection @pageClass="user-summary" @tagName="">
   <div class="user-content">
-    <PluginOutlet @name="above-user-summary-stats" @args={{hash model=model user=user}} />
-    {{#if model.can_see_summary_stats}}
+    <PluginOutlet @name="above-user-summary-stats" @args={{hash model=this.model user=this.user}} />
+    {{#if this.model.can_see_summary_stats}}
       <div class="top-section stats-section">
         <h3 class="stats-title">{{i18n "user.summary.stats"}}</h3>
         <ul>
           <li class="stats-days-visited">
-            <UserStat @value={{model.days_visited}} @label="user.summary.days_visited" />
+            <UserStat @value={{this.model.days_visited}} @label="user.summary.days_visited" />
           </li>
           <li class="stats-time-read">
-            <UserStat @value={{timeRead}} @label="user.summary.time_read" @rawTitle={{i18n "user.summary.time_read_title" duration=timeReadMedium}} @type="string" />
+            <UserStat @value={{this.timeRead}} @label="user.summary.time_read" @rawTitle={{i18n "user.summary.time_read_title" duration=this.timeReadMedium}} @type="string" />
           </li>
-          {{#if showRecentTimeRead}}
+          {{#if this.showRecentTimeRead}}
             <li class="stats-recent-read">
-              <UserStat @value={{recentTimeRead}} @label="user.summary.recent_time_read" @rawTitle={{i18n "user.summary.recent_time_read_title" duration=recentTimeReadMedium}} @type="string" />
+              <UserStat @value={{this.recentTimeRead}} @label="user.summary.recent_time_read" @rawTitle={{i18n "user.summary.recent_time_read_title" duration=this.recentTimeReadMedium}} @type="string" />
             </li>
           {{/if}}
           <li class="stats-topics-entered">
-            <UserStat @value={{model.topics_entered}} @label="user.summary.topics_entered" />
+            <UserStat @value={{this.model.topics_entered}} @label="user.summary.topics_entered" />
           </li>
           <li class="stats-posts-read">
-            <UserStat @value={{model.posts_read_count}} @label="user.summary.posts_read" />
+            <UserStat @value={{this.model.posts_read_count}} @label="user.summary.posts_read" />
           </li>
           <li class="stats-likes-given linked-stat">
             <LinkTo @route="userActivity.likesGiven">
-              <UserStat @value={{model.likes_given}} @icon="heart" @label="user.summary.likes_given" />
+              <UserStat @value={{this.model.likes_given}} @icon="heart" @label="user.summary.likes_given" />
             </LinkTo>
           </li>
           <li class="stats-likes-received">
-            <UserStat @value={{model.likes_received}} @icon="heart" @label="user.summary.likes_received" />
+            <UserStat @value={{this.model.likes_received}} @icon="heart" @label="user.summary.likes_received" />
           </li>
-          {{#if model.bookmark_count}}
+          {{#if this.model.bookmark_count}}
             <li class="stats-bookmark-count linked-stat">
               <LinkTo @route="userActivity.bookmarks">
-                <UserStat @value={{model.bookmark_count}} @label="user.summary.bookmark_count" />
+                <UserStat @value={{this.model.bookmark_count}} @label="user.summary.bookmark_count" />
               </LinkTo>
             </li>
           {{/if}}
           <li class="stats-topic-count linked-stat">
             <LinkTo @route="userActivity.topics">
-              <UserStat @value={{model.topic_count}} @label="user.summary.topic_count" />
+              <UserStat @value={{this.model.topic_count}} @label="user.summary.topic_count" />
             </LinkTo>
           </li>
           <li class="stats-post-count linked-stat">
             <LinkTo @route="userActivity.replies">
-              <UserStat @value={{model.post_count}} @label="user.summary.post_count" />
+              <UserStat @value={{this.model.post_count}} @label="user.summary.post_count" />
             </LinkTo>
           </li>
-          <PluginOutlet @name="user-summary-stat" @connectorTagName="li" @args={{hash model=model user=user}} />
+          <PluginOutlet @name="user-summary-stat" @connectorTagName="li" @args={{hash model=this.model user=this.user}} />
         </ul>
       </div>
     {{/if}}
 
     <div class="top-section">
       <UserSummarySection @title="top_replies" @class="replies-section pull-left">
-        <UserSummaryTopicsList @type="replies" @items={{model.replies}} @user={{user}} as |reply|>
+        <UserSummaryTopicsList @type="replies" @items={{this.model.replies}} @user={{this.user}} as |reply|>
           <UserSummaryTopic @createdAt={{reply.createdAt}} @topic={{reply.topic}} @likes={{reply.like_count}} @url={{reply.url}} />
         </UserSummaryTopicsList>
       </UserSummarySection>
 
       <UserSummarySection @title="top_topics" @class="topics-section pull-right">
-        <UserSummaryTopicsList @type="topics" @items={{model.topics}} @user={{user}} as |topic|>
+        <UserSummaryTopicsList @type="topics" @items={{this.model.topics}} @user={{this.user}} as |topic|>
           <UserSummaryTopic @createdAt={{topic.created_at}} @topic={{topic}} @likes={{topic.like_count}} @url={{topic.url}} />
         </UserSummaryTopicsList>
       </UserSummarySection>
@@ -68,15 +68,15 @@
 
     <div class="top-section">
       <UserSummarySection @title="top_links" @class="links-section pull-left">
-        {{#if model.links.length}}
+        {{#if this.model.links.length}}
           <ul>
             {{!-- template-lint-disable --}}
-            {{#each model.links as |link|}}
+            {{#each this.model.links as |link|}}
               <li>
                 <a class='domain'
                    href={{link.url}}
                    title={{link.title}}
-                   rel='noopener {{unless user.removeNoFollow 'nofollow ugc'}}'
+                   rel='noopener {{unless this.user.removeNoFollow 'nofollow ugc'}}'
                    target='_blank'>
                   {{shorten-url link.url}}
                 </a>
@@ -92,7 +92,7 @@
       </UserSummarySection>
 
       <UserSummarySection @title="most_replied_to_users" @class="summary-user-list replied-section pull-right">
-        <UserSummaryUsersList @none="no_replies" @users={{model.most_replied_to_users}} as |user|>
+        <UserSummaryUsersList @none="no_replies" @users={{this.model.most_replied_to_users}} as |user|>
           <UserSummaryUser @user={{user}} @icon="reply" @countClass="replies" />
         </UserSummaryUsersList>
       </UserSummarySection>
@@ -100,19 +100,19 @@
 
     <div class="top-section most-liked-section">
       <UserSummarySection @title="most_liked_by" @class="summary-user-list liked-by-section pull-left">
-        <UserSummaryUsersList @none="no_likes" @users={{model.most_liked_by_users}} as |user|>
+        <UserSummaryUsersList @none="no_likes" @users={{this.model.most_liked_by_users}} as |user|>
           <UserSummaryUser @user={{user}} @icon="heart" @countClass="likes" />
         </UserSummaryUsersList>
       </UserSummarySection>
 
       <UserSummarySection @title="most_liked_users" @class="summary-user-list liked-section pull-right">
-        <UserSummaryUsersList @none="no_likes" @users={{model.most_liked_users}} as |user|>
+        <UserSummaryUsersList @none="no_likes" @users={{this.model.most_liked_users}} as |user|>
           <UserSummaryUser @user={{user}} @icon="heart" @countClass="likes" />
         </UserSummaryUsersList>
       </UserSummarySection>
     </div>
 
-    {{#if model.top_categories.length}}
+    {{#if this.model.top_categories.length}}
       <div class="top-section top-categories-section">
         <UserSummarySection @title="top_categories" @class="summary-category-list pull-left">
           <table>
@@ -122,16 +122,16 @@
               <th class="reply-count">{{i18n "user.summary.replies"}}</th>
             </thead>
             <tbody>
-              {{#each model.top_categories as |category|}}
+              {{#each this.model.top_categories as |category|}}
                 <tr>
                   <td class="category-link">
                     {{category-link category allowUncategorized="true" hideParent=false}}
                   </td>
                   <td class="topic-count">
-                    <UserSummaryCategorySearch @user={{user}} @category={{category}} @count={{category.topic_count}} />
+                    <UserSummaryCategorySearch @user={{this.user}} @category={{category}} @count={{category.topic_count}} />
                   </td>
                   <td class="reply-count">
-                    <UserSummaryCategorySearch @user={{user}} @category={{category}} @count={{category.post_count}} />
+                    <UserSummaryCategorySearch @user={{this.user}} @category={{category}} @count={{category.post_count}} />
                   </td>
                 </tr>
               {{/each}}
@@ -141,23 +141,23 @@
       </div>
     {{/if}}
 
-    {{#if siteSettings.enable_badges}}
+    {{#if this.siteSettings.enable_badges}}
       <div class="top-section badges-section">
         <h3 class="stats-title">{{i18n "user.summary.top_badges"}}</h3>
 
-        {{#if model.badges}}
+        {{#if this.model.badges}}
           <div class="badge-group-list">
-            {{#each model.badges as |badge|}}
-              <BadgeCard @badge={{badge}} @count={{badge.count}} @username={{user.username_lower}} />
+            {{#each this.model.badges as |badge|}}
+              <BadgeCard @badge={{badge}} @count={{badge.count}} @username={{this.user.username_lower}} />
             {{/each}}
-            <PluginOutlet @name="after-user-summary-badges" @args={{hash model=model user=user}} />
+            <PluginOutlet @name="after-user-summary-badges" @args={{hash model=this.model user=this.user}} />
           </div>
         {{else}}
           <p>{{i18n "user.summary.no_badges"}}</p>
         {{/if}}
 
-        {{#if moreBadges}}
-          <LinkTo @route="user.badges" @model={{user}} class="more">
+        {{#if this.moreBadges}}
+          <LinkTo @route="user.badges" @model={{this.user}} class="more">
             {{i18n "user.summary.more_badges"}}
           </LinkTo>
         {{/if}}
diff --git a/app/assets/javascripts/discourse/app/templates/users.hbs b/app/assets/javascripts/discourse/app/templates/users.hbs
index ccff2998c46..a78ddf5d3d5 100644
--- a/app/assets/javascripts/discourse/app/templates/users.hbs
+++ b/app/assets/javascripts/discourse/app/templates/users.hbs
@@ -2,40 +2,40 @@
   <LoadMore @selector=".directory tbody tr" @action={{action "loadMore"}}>
     <div class="container">
       <div class="users-directory directory">
-        <PluginOutlet @name="users-top" @tagName="span" @connectorTagName="div" @args={{hash model=model}} />
+        <PluginOutlet @name="users-top" @tagName="span" @connectorTagName="div" @args={{hash model=this.model}} />
         <div class="directory-controls">
           <div class="period-controls">
-            <PeriodChooser @period={{period}} @onChange={{action (mut period)}} @fullDay={{false}} />
-            {{#if lastUpdatedAt}}
+            <PeriodChooser @period={{this.period}} @onChange={{action (mut this.period)}} @fullDay={{false}} />
+            {{#if this.lastUpdatedAt}}
               <div class="directory-last-updated">
                 {{i18n "directory.last_updated"}}
-                {{lastUpdatedAt}}
+                {{this.lastUpdatedAt}}
               </div>
             {{/if}}
           </div>
           <div class="inline-form">
             <label class="total-rows">
-              {{#if model.totalRows}}
-                {{i18n "directory.total_rows" count=model.totalRows}}
+              {{#if this.model.totalRows}}
+                {{i18n "directory.total_rows" count=this.model.totalRows}}
               {{/if}}
             </label>
-            <Input @value={{readonly nameInput}} @input={{action "onUsernameFilterChanged" value="target.value"}} @placeholderKey="directory.filter_name" class="filter-name no-blur" />
-            {{#if showGroupFilter}}
-              <ComboBox @class="directory-group-selector" @value={{group}} @content={{groupOptions}} @onChange={{action groupChanged}} @options={{hash
+            <Input @value={{readonly this.nameInput}} @input={{action "onUsernameFilterChanged" value="target.value"}} @placeholderKey="directory.filter_name" class="filter-name no-blur" />
+            {{#if this.showGroupFilter}}
+              <ComboBox @class="directory-group-selector" @value={{this.group}} @content={{this.groupOptions}} @onChange={{action this.groupChanged}} @options={{hash
                   none="directory.group.all"
                 }} />
             {{/if}}
-            {{#if currentUser.staff}}
+            {{#if this.currentUser.staff}}
               <DButton @icon="wrench" @action={{action "showEditColumnsModal"}} @class="btn-default open-edit-columns-btn" />
             {{/if}}
-            <PluginOutlet @name="users-directory-controls" @args={{hash model=model}} />
+            <PluginOutlet @name="users-directory-controls" @args={{hash model=this.model}} />
           </div>
         </div>
 
-        <ConditionalLoadingSpinner @condition={{isLoading}}>
-          {{#if model.length}}
-            <DirectoryTable @items={{model}} @columns={{columns}} @showTimeRead={{showTimeRead}} @order={{order}} @asc={{asc}} />
-            <ConditionalLoadingSpinner @condition={{model.loadingMore}} />
+        <ConditionalLoadingSpinner @condition={{this.isLoading}}>
+          {{#if this.model.length}}
+            <DirectoryTable @items={{this.model}} @columns={{this.columns}} @showTimeRead={{this.showTimeRead}} @order={{this.order}} @asc={{this.asc}} />
+            <ConditionalLoadingSpinner @condition={{this.model.loadingMore}} />
           {{else}}
             <div class="clearfix"></div>
             <p>{{i18n "directory.no_results"}}</p>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
index 55c109ac10f..be905e0d4d3 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/category-drop/category-drop-header.hbs
@@ -1,10 +1,10 @@
 <div class="select-kit-header-wrapper">
-  {{component selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
-    shouldDisplayClearableButton=shouldDisplayClearableButton
+  {{component this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
+    shouldDisplayClearableButton=this.shouldDisplayClearableButton
   }}
 
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
index 437dfc74efd..0e7b232332d 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/category-row.hbs
@@ -1,16 +1,16 @@
-{{#if category}}
+{{#if this.category}}
   <div class="category-status" aria-hidden="true">
-    {{#if hasParentCategory}}
-      {{#unless hideParentCategory}}
-        {{badgeForParentCategory}}
+    {{#if this.hasParentCategory}}
+      {{#unless this.hideParentCategory}}
+        {{this.badgeForParentCategory}}
       {{/unless}}
     {{/if}}
-    {{badgeForCategory}}
+    {{this.badgeForCategory}}
   </div>
 
-  {{#if shouldDisplayDescription}}
-    <div class="category-desc" aria-hidden="true">{{dir-span descriptionText  htmlSafe="true"}}</div>
+  {{#if this.shouldDisplayDescription}}
+    <div class="category-desc" aria-hidden="true">{{dir-span this.descriptionText  htmlSafe="true"}}</div>
   {{/if}}
 {{else}}
-  {{html-safe label}}
+  {{html-safe this.label}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
index 7b36e220e22..94b61a75511 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/color-palettes/color-palettes-row.hbs
@@ -1,9 +1,9 @@
 <span class="name">
-  {{label}}
+  {{this.label}}
 </span>
 
-{{#if item.colors}}
-  <div class="palettes" style={{backgroundColor}}>
-    {{palettes}}
+{{#if this.item.colors}}
+  <div class="palettes" style={{this.backgroundColor}}>
+    {{this.palettes}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
index e67854ae271..1d5be8a6e7e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/combo-box/combo-box-header.hbs
@@ -1,15 +1,15 @@
 <div class="select-kit-header-wrapper">
-  {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+  {{#each this.icons as |icon|}} {{d-icon icon}} {{/each}}
 
-  {{component selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
+  {{component this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
   }}
 
-  {{#if shouldDisplayClearableButton}}
-    <DButton @class="btn-clear" @icon="times" @action={{selectKit.onClearSelection}} @ariaLabel="clear_input" />
+  {{#if this.shouldDisplayClearableButton}}
+    <DButton @class="btn-clear" @icon="times" @action={{this.selectKit.onClearSelection}} @ariaLabel="clear_input" />
   {{/if}}
 
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
index 838b39e22e9..315d7d9f427 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/create-color-row.hbs
@@ -1 +1 @@
-<span>{{label}}</span>
+<span>{{this.label}}</span>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
index 18801763a61..5babe8589bb 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-header.hbs
@@ -1,15 +1,15 @@
 <div class="select-kit-header-wrapper">
-  {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+  {{#each this.icons as |icon|}} {{d-icon icon}} {{/each}}
 
-  {{component selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
-    shouldDisplayClearableButton=shouldDisplayClearableButton
+  {{component this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
+    shouldDisplayClearableButton=this.shouldDisplayClearableButton
   }}
 
-  {{#if selectKit.options.showCaret}}
-    {{d-icon caretIcon class="caret-icon"}}
+  {{#if this.selectKit.options.showCaret}}
+    {{d-icon this.caretIcon class="caret-icon"}}
   {{/if}}
   &#8203;
   {{! Zero-width space character, so icon-only button height = regular button height }}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
index 2f880ca58cc..bdde8ee21cd 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/dropdown-select-box/dropdown-select-box-row.hbs
@@ -1,13 +1,13 @@
-{{#if icons}}
+{{#if this.icons}}
   <div class="icons">
     <span class="selection-indicator"></span>
-    {{#each icons as |icon|}}
-      {{d-icon icon translatedTitle=(dasherize title)}}
+    {{#each this.icons as |icon|}}
+      {{d-icon icon translatedTitle=(dasherize this.title)}}
     {{/each}}
   </div>
 {{/if}}
 
 <div class="texts">
-  <span class="name">{{html-safe label}}</span>
-  <span class="desc">{{html-safe description}}</span>
+  <span class="name">{{html-safe this.label}}</span>
+  <span class="desc">{{html-safe this.description}}</span>
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
index bb7ef806240..aa19715205d 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/email-group-user-chooser-row.hbs
@@ -1,13 +1,13 @@
-{{#if item.isUser}}
-  {{avatar item imageSize="tiny"}}
-  <span class="identifier">{{format-username item.id}}</span>
-  <span class="name">{{item.name}}</span>
-  {{decorate-username-selector item.id}}
-{{else if item.isGroup}}
+{{#if this.item.isUser}}
+  {{avatar this.item imageSize="tiny"}}
+  <span class="identifier">{{format-username this.item.id}}</span>
+  <span class="name">{{this.item.name}}</span>
+  {{decorate-username-selector this.item.id}}
+{{else if this.item.isGroup}}
   {{d-icon "users"}}
-  <span class="identifier">{{item.id}}</span>
-  <span class="name">{{item.full_name}}</span>
+  <span class="identifier">{{this.item.id}}</span>
+  <span class="name">{{this.item.full_name}}</span>
 {{else}}
   {{d-icon "envelope"}}
-  <span class="identifier">{{item.id}}</span>
+  <span class="identifier">{{this.item.id}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs
index 4a638c6d6fd..894680431b0 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/flair-row.hbs
@@ -1,5 +1,5 @@
-{{#if item.url}}
-  <AvatarFlair @flairName={{item.name}} @flairUrl={{item.url}} @flairBgColor={{item.bgColor}} @flairColor={{item.color}} />
+{{#if this.item.url}}
+  <AvatarFlair @flairName={{this.item.name}} @flairUrl={{this.item.url}} @flairBgColor={{this.item.bgColor}} @flairColor={{this.item.color}} />
 {{/if}}
 
-<span>{{label}}</span>
+<span>{{this.label}}</span>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
index 85b17e2435b..9b34e88160a 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-header.hbs
@@ -1,21 +1,21 @@
 <div class="select-kit-header-wrapper">
-  {{#if icons}}
+  {{#if this.icons}}
     <div class="future-date-input-selector-icons">
-      {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+      {{#each this.icons as |icon|}} {{d-icon icon}} {{/each}}
     </div>
   {{/if}}
 
-  {{component selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
+  {{component this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
   }}
 
-  {{#if selectedContent.timeFormatted}}
+  {{#if this.selectedContent.timeFormatted}}
     <span class="future-date-input-selector-datetime">
-      {{selectedContent.timeFormatted}}
+      {{this.selectedContent.timeFormatted}}
     </span>
   {{/if}}
 
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
index 7e55da0379f..8d6be52bac9 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/future-date-input-selector/future-date-input-selector-row.hbs
@@ -1,13 +1,13 @@
-{{#if item.icon}}
+{{#if this.item.icon}}
   <div class="future-date-input-selector-icons">
-    {{d-icon item.icon}}
+    {{d-icon this.item.icon}}
   </div>
 {{/if}}
 
-<span class="name">{{label}}</span>
+<span class="name">{{this.label}}</span>
 
-{{#if item.timeFormatted}}
+{{#if this.item.timeFormatted}}
   <span class="future-date-input-selector-datetime">
-    {{item.timeFormatted}}
+    {{this.item.timeFormatted}}
   </span>
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
index 274fd89929f..9882010b594 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/mini-tag-chooser/selected-collection.hbs
@@ -1,7 +1,7 @@
-{{#if tags}}
+{{#if this.tags}}
   <div class="mini-tag-chooser-selected-collection selected-tags">
-    {{#each tags as |tag|}}
-      <DButton @translatedTitle={{tag.value}} @icon="times" @action={{action selectKit.deselect}} @actionParam={{tag.value}} @class={{tag.classNames}} @tabindex={{0}}>
+    {{#each this.tags as |tag|}}
+      <DButton @translatedTitle={{tag.value}} @icon="times" @action={{action this.selectKit.deselect}} @actionParam={{tag.value}} @class={{tag.classNames}} @tabindex={{0}}>
         {{discourse-tag tag.value noHref=true}}
       </DButton>
     {{/each}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
index 388d91b6b97..4d9a2fc56ae 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select.hbs
@@ -1,52 +1,52 @@
-{{#unless selectKit.isHidden}}
-  {{component selectKit.options.headerComponent
-    tabindex=tabindex
-    value=value
-    selectedContent=selectedContent
-    selectKit=selectKit
-    id=(concat selectKit.uniqueID "-header")
+{{#unless this.selectKit.isHidden}}
+  {{component this.selectKit.options.headerComponent
+    tabindex=this.tabindex
+    value=this.value
+    selectedContent=this.selectedContent
+    selectKit=this.selectKit
+    id=(concat this.selectKit.uniqueID "-header")
   }}
 
-  <SelectKit::SelectKitBody @selectKit={{selectKit}} @id={{concat selectKit.uniqueID "-body"}}>
-    {{component selectKit.options.filterComponent
-      selectKit=selectKit
-      id=(concat selectKit.uniqueID "-filter")
+  <SelectKit::SelectKitBody @selectKit={{this.selectKit}} @id={{concat this.selectKit.uniqueID "-body"}}>
+    {{component this.selectKit.options.filterComponent
+      selectKit=this.selectKit
+      id=(concat this.selectKit.uniqueID "-filter")
     }}
 
-    {{#if selectedContent.length}}
+    {{#if this.selectedContent.length}}
       <div class="selected-content">
-        {{#each selectedContent as |item|}}
-          {{component selectKit.options.selectedChoiceComponent
+        {{#each this.selectedContent as |item|}}
+          {{component this.selectKit.options.selectedChoiceComponent
             item=item
-            selectKit=selectKit
+            selectKit=this.selectKit
           }}
         {{/each}}
       </div>
     {{/if}}
 
-    {{#if selectKit.isLoading}}
+    {{#if this.selectKit.isLoading}}
       <span class="is-loading">
-        {{#if site}}
+        {{#if this.site}}
           {{loading-spinner size="small"}}
         {{/if}}
       </span>
     {{else}}
-      {{#each collections as |collection|}}
-        {{component (component-for-collection collection.identifier selectKit)
+      {{#each this.collections as |collection|}}
+        {{component (component-for-collection collection.identifier this.selectKit)
           collection=collection
-          selectKit=selectKit
-          value=value
+          selectKit=this.selectKit
+          value=this.value
         }}
       {{/each}}
 
-      {{#if selectKit.filter}}
-        {{#if selectKit.hasNoContent}}
+      {{#if this.selectKit.filter}}
+        {{#if this.selectKit.hasNoContent}}
           <span class="no-content" role="alert">
             {{i18n "select_kit.no_content"}}
           </span>
         {{else}}
           <span class="results-count" role="alert">
-            {{i18n "select_kit.results_count" count=mainCollection.length}}
+            {{i18n "select_kit.results_count" count=this.mainCollection.length}}
           </span>
         {{/if}}
       {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs
index 3ceb155adb7..358e72692d6 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/format-selected-content.hbs
@@ -1,3 +1,3 @@
 <span class="formatted-selection">
-  {{formattedContent}}
+  {{this.formattedContent}}
 </span>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
index b728e6bf3cd..d1e154f0f83 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/multi-select-header.hbs
@@ -1,9 +1,9 @@
 <div class="select-kit-header-wrapper">
-  {{#each icons as |icon|}}
+  {{#each this.icons as |icon|}}
     {{d-icon icon}}
   {{/each}}
 
-  <MultiSelect::FormatSelectedContent @content={{selectedContent}} @selectKit={{selectKit}} />
+  <MultiSelect::FormatSelectedContent @content={{this.selectedContent}} @selectKit={{this.selectKit}} />
 
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
index 5d35d2b7941..ddad59ca69f 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/multi-select/selected-category.hbs
@@ -1,6 +1,6 @@
-<div {{action "onSelectedNameClick"}} tabindex="0" title={{title}} data-value={{value}} data-name={{name}} class="select-kit-selected-name selected-name choice">
+<div {{action "onSelectedNameClick"}} tabindex="0" title={{this.title}} data-value={{this.value}} data-name={{this.name}} class="select-kit-selected-name selected-name choice">
   <div class="body">
-    {{badge}}
+    {{this.badge}}
     {{d-icon "times"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
index e980933ffc9..f50bb626514 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/notifications-filter/notifications-filter-header.hbs
@@ -3,7 +3,7 @@
     {{i18n "user.user_notifications.filters.filter_by"}}
   </span>
   <span class="header-text">
-    {{i18n label}}
+    {{i18n this.label}}
   </span>
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
index 67afe56607a..351edf87f62 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-header.hbs
@@ -1,8 +1,8 @@
-<h2 class="selected-name" title={{title}} role="option">
-  {{period-title value
+<h2 class="selected-name" title={{this.title}} role="option">
+  {{period-title this.value
     showDateRange=true
-    fullDay=selectKit.options.fullDay
+    fullDay=this.selectKit.options.fullDay
   }}
 </h2>
 
-{{d-icon caretIcon class="caret-icon"}}
+{{d-icon this.caretIcon class="caret-icon"}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
index a0a5977c831..6e02bc4195e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/period-chooser/period-chooser-row.hbs
@@ -1,8 +1,8 @@
 <span class="selection-indicator"></span>
 
 <span class="period-title">
-  {{period-title rowValue
+  {{period-title this.rowValue
     showDateRange=true
-    fullDay=selectKit.options.fullDay
+    fullDay=this.selectKit.options.fullDay
   }}
 </span>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
index 46079b12093..faf47e1aee8 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/pinned-button.hbs
@@ -1,4 +1,4 @@
 <p class="reason">
-  <PinnedOptions @value={{pinned}} @topic={{topic}} />
-  <span class="text">{{html-safe reasonText}}</span>
+  <PinnedOptions @value={{this.pinned}} @topic={{this.topic}} />
+  <span class="text">{{html-safe this.reasonText}}</span>
 </p>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
index 1c6072737a4..d3b61742d8b 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/errors-collection.hbs
@@ -1,6 +1,6 @@
-{{#if collection.content}}
+{{#if this.collection.content}}
   <ul class="select-kit-errors-collection">
-    {{#each collection.content as |item|}}
+    {{#each this.collection.content as |item|}}
       <li class="select-kit-error">{{item}}</li>
     {{/each}}
   </ul>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
index cc9c19b3b4f..ceb06d5a35e 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-body.hbs
@@ -1,3 +1,3 @@
-{{#if selectKit.isExpanded}}
+{{#if this.selectKit.isExpanded}}
   {{yield}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
index a9159ba7894..c61d082daf8 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-collection.hbs
@@ -1,10 +1,10 @@
-{{#if collection.content.length}}
+{{#if this.collection.content.length}}
   <ul class="select-kit-collection" aria-live="polite" role="menu">
-    {{#each collection.content as |item|}}
-      {{component (component-for-row collection.identifier item selectKit)
+    {{#each this.collection.content as |item|}}
+      {{component (component-for-row this.collection.identifier item this.selectKit)
         item=item
-        value=value
-        selectKit=selectKit
+        value=this.value
+        selectKit=this.selectKit
       }}
     {{/each}}
   </ul>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
index 6b0da3675d4..e910d157772 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-filter.hbs
@@ -1,8 +1,8 @@
-{{#unless isHidden}}
+{{#unless this.isHidden}}
   {{!-- filter-input-search prevents 1password from attempting autocomplete --}}
-  <Input @tabindex={{0}} class="filter-input" placeholder={{placeholder}} @autocomplete="off" @autocorrect="off" @autocapitalize="off" @name="filter-input-search" @spellcheck={{false}} @value={{readonly selectKit.filter}} @input={{action "onInput"}} @paste={{action "onPaste"}} @keyDown={{action "onKeydown"}} @keyUp={{action "onKeyup"}} @type="search" />
+  <Input @tabindex={{0}} class="filter-input" placeholder={{this.placeholder}} @autocomplete="off" @autocorrect="off" @autocapitalize="off" @name="filter-input-search" @spellcheck={{false}} @value={{readonly this.selectKit.filter}} @input={{action "onInput"}} @paste={{action "onPaste"}} @keyDown={{action "onKeydown"}} @keyUp={{action "onKeyup"}} @type="search" />
 
-  {{#if selectKit.options.filterIcon}}
-    {{d-icon selectKit.options.filterIcon class="filter-icon"}}
+  {{#if this.selectKit.options.filterIcon}}
+    {{d-icon this.selectKit.options.filterIcon class="filter-icon"}}
   {{/if}}
 {{/unless}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
index b84d22c5008..df05d82b10d 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/select-kit-row.hbs
@@ -1,7 +1,7 @@
-{{#each icons as |icon|}}
-  {{d-icon icon translatedTitle=dasherizedTitle}}
+{{#each this.icons as |icon|}}
+  {{d-icon icon translatedTitle=this.dasherizedTitle}}
 {{/each}}
 
 <span class="name">
-  {{label}}
+  {{this.label}}
 </span>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
index f31aecab0f9..ab4792a548c 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/select-kit/single-select-header.hbs
@@ -1,8 +1,8 @@
 <div class="select-kit-header-wrapper">
-  {{#each icons as |icon|}} {{d-icon icon}} {{/each}}
+  {{#each this.icons as |icon|}} {{d-icon icon}} {{/each}}
 
-  {{component selectKit.options.selectedNameComponent
-    item=selectedContent
-    selectKit=selectKit
+  {{component this.selectKit.options.selectedNameComponent
+    item=this.selectedContent
+    selectKit=this.selectKit
   }}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs
index 834e57e557a..8be2beb5cee 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice-category.hbs
@@ -1,3 +1,3 @@
-<SelectedChoice @item={{item}} @selectKit={{selectKit}} @extraClass={{extraClass}}>
-  {{badge}}
+<SelectedChoice @item={{this.item}} @selectKit={{this.selectKit}} @extraClass={{this.extraClass}}>
+  {{this.badge}}
 </SelectedChoice>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
index f0b00dd736d..8e21aee4b54 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-choice.hbs
@@ -1,10 +1,10 @@
-<button aria-label={{i18n "select_kit.delete_item" name=itemName}} id="{{id}}-choice" data-value={{itemValue}} data-name={{itemName}} type="button" {{action selectKit.deselect item}} class="btn btn-default selected-choice {{extraClass}}">
+<button aria-label={{i18n "select_kit.delete_item" name=this.itemName}} id="{{this.id}}-choice" data-value={{this.itemValue}} data-name={{this.itemName}} type="button" {{action this.selectKit.deselect this.item}} class="btn btn-default selected-choice {{this.extraClass}}">
   {{d-icon "times"}}
   {{#if (has-block)}}
     {{yield}}
   {{else}}
     <span class="d-button-label">
-      {{itemName}}
+      {{this.itemName}}
     </span>
   {{/if}}
 </button>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
index d17e7fc76e4..d014aecd3e0 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/selected-name.hbs
@@ -1,21 +1,21 @@
-{{#if selectKit.options.showFullTitle}}
-  <div lang={{lang}} title={{title}} data-value={{value}} data-name={{name}} role="option" class="select-kit-selected-name selected-name choice">
-    {{#if item.icon}}
-      {{d-icon item.icon}}
+{{#if this.selectKit.options.showFullTitle}}
+  <div lang={{this.lang}} title={{this.title}} data-value={{this.value}} data-name={{this.name}} role="option" class="select-kit-selected-name selected-name choice">
+    {{#if this.item.icon}}
+      {{d-icon this.item.icon}}
     {{/if}}
 
     <span class="name">
-      {{label}}
+      {{this.label}}
     </span>
 
-    {{#if shouldDisplayClearableButton}}
-      <DButton @class="btn-clear" @icon="times" @action={{selectKit.deselect}} @actionParam={{item}} @ariaLabel="clear_input" />
+    {{#if this.shouldDisplayClearableButton}}
+      <DButton @class="btn-clear" @icon="times" @action={{this.selectKit.deselect}} @actionParam={{this.item}} @ariaLabel="clear_input" />
     {{/if}}
   </div>
 {{else}}
-  {{#if item.icon}}
-    <div role="option" lang={{lang}} class="select-kit-selected-name selected-name choice">
-      {{d-icon item.icon}}
+  {{#if this.item.icon}}
+    <div role="option" lang={{this.lang}} class="select-kit-selected-name selected-name choice">
+      {{d-icon this.item.icon}}
     </div>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
index d296124b4ab..f752f5c2663 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/single-select.hbs
@@ -1,41 +1,41 @@
-{{#unless selectKit.isHidden}}
-  {{component selectKit.options.headerComponent
-    tabindex=tabindex
-    value=value
-    selectedContent=selectedContent
-    selectKit=selectKit
-    id=(concat selectKit.uniqueID "-header")
+{{#unless this.selectKit.isHidden}}
+  {{component this.selectKit.options.headerComponent
+    tabindex=this.tabindex
+    value=this.value
+    selectedContent=this.selectedContent
+    selectKit=this.selectKit
+    id=(concat this.selectKit.uniqueID "-header")
   }}
 
-  <SelectKit::SelectKitBody @selectKit={{selectKit}} @id={{concat selectKit.uniqueID "-body"}}>
-    {{component selectKit.options.filterComponent
-      selectKit=selectKit
-      id=(concat selectKit.uniqueID "-filter")
+  <SelectKit::SelectKitBody @selectKit={{this.selectKit}} @id={{concat this.selectKit.uniqueID "-body"}}>
+    {{component this.selectKit.options.filterComponent
+      selectKit=this.selectKit
+      id=(concat this.selectKit.uniqueID "-filter")
     }}
 
-    {{#if selectKit.isLoading}}
+    {{#if this.selectKit.isLoading}}
       <span class="is-loading">
-        {{#if site}}
+        {{#if this.site}}
           {{loading-spinner size="small"}}
         {{/if}}
       </span>
     {{else}}
-      {{#each collections as |collection|}}
-        {{component (component-for-collection collection.identifier selectKit)
+      {{#each this.collections as |collection|}}
+        {{component (component-for-collection collection.identifier this.selectKit)
           collection=collection
-          selectKit=selectKit
-          value=value
+          selectKit=this.selectKit
+          value=this.value
         }}
       {{/each}}
 
-      {{#if selectKit.filter}}
-        {{#if selectKit.hasNoContent}}
+      {{#if this.selectKit.filter}}
+        {{#if this.selectKit.hasNoContent}}
           <span class="no-content" role="alert">
             {{i18n "select_kit.no_content"}}
           </span>
         {{else}}
           <span class="results-count" role="alert">
-            {{i18n "select_kit.results_count" count=mainCollection.length}}
+            {{i18n "select_kit.results_count" count=this.mainCollection.length}}
           </span>
         {{/if}}
       {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
index ef4dbda96b5..6042013ecdb 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/tag-chooser-row.hbs
@@ -1 +1 @@
-{{discourse-tag rowValue count=item.count noHref=true}}
+{{discourse-tag this.rowValue count=this.item.count noHref=true}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
index fe381b427b4..cc243c2ea01 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/more-tags-collection.hbs
@@ -1,4 +1,4 @@
-{{#if collection.content.shouldShowMoreTags}}
+{{#if this.collection.content.shouldShowMoreTags}}
   <div class="more-tags">
     {{i18n "select_kit.components.tag_drop.filter_for_more"}}
   </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
index 55c109ac10f..be905e0d4d3 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/tag-drop/tag-drop-header.hbs
@@ -1,10 +1,10 @@
 <div class="select-kit-header-wrapper">
-  {{component selectKit.options.selectedNameComponent
-    tabindex=tabindex
-    item=selectedContent
-    selectKit=selectKit
-    shouldDisplayClearableButton=shouldDisplayClearableButton
+  {{component this.selectKit.options.selectedNameComponent
+    tabindex=this.tabindex
+    item=this.selectedContent
+    selectKit=this.selectKit
+    shouldDisplayClearableButton=this.shouldDisplayClearableButton
   }}
 
-  {{d-icon caretIcon class="caret-icon"}}
+  {{d-icon this.caretIcon class="caret-icon"}}
 </div>
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
index da8360699bd..36c3a7deee3 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/tag-row.hbs
@@ -1,4 +1,4 @@
-{{discourse-tag rowValue
+{{discourse-tag this.rowValue
   noHref=true
-  count=item.count
+  count=this.item.count
 }}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs b/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
index 0b82f33dcc4..d5a0b040498 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/toolbar-popup-menu-options/toolbar-popup-menu-options-heading.hbs
@@ -1 +1 @@
-{{heading}}
+{{this.heading}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
index 8c683d1ca66..61849f4b2b7 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/topic-notifications-button.hbs
@@ -1,18 +1,18 @@
-{{#if appendReason}}
+{{#if this.appendReason}}
   <p class="reason">
-    <TopicNotificationsOptions @value={{notificationLevel}} @topic={{topic}} @onChange={{action "changeTopicNotificationLevel"}} @options={{hash
-        icon=icon
-        showFullTitle=showFullTitle
-        showCaret=showCaret
+    <TopicNotificationsOptions @value={{this.notificationLevel}} @topic={{this.topic}} @onChange={{action "changeTopicNotificationLevel"}} @options={{hash
+        icon=this.icon
+        showFullTitle=this.showFullTitle
+        showCaret=this.showCaret
         headerAriaLabel=(i18n "topic.notifications.title")
       }} />
-    <span class="text">{{html-safe notificationReasonText}}</span>
+    <span class="text">{{html-safe this.notificationReasonText}}</span>
   </p>
 {{else}}
-  <TopicNotificationsOptions @value={{notificationLevel}} @topic={{topic}} @onChange={{action "changeTopicNotificationLevel"}} @options={{hash
-      icon=icon
-      showFullTitle=showFullTitle
-      showCaret=showCaret
+  <TopicNotificationsOptions @value={{this.notificationLevel}} @topic={{this.topic}} @onChange={{action "changeTopicNotificationLevel"}} @options={{hash
+      icon=this.icon
+      showFullTitle=this.showFullTitle
+      showCaret=this.showCaret
       headerAriaLabel=(i18n "topic.notifications.title")
     }} />
 {{/if}}
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs
index 0cea321a49f..d0cf414bab0 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/topic-row.hbs
@@ -1,7 +1,7 @@
-<TopicStatus @topic={{item}} @disableActions={{true}} />
-<div class="topic-title">{{replace-emoji item.fancy_title}}</div>
+<TopicStatus @topic={{this.item}} @disableActions={{true}} />
+<div class="topic-title">{{replace-emoji this.item.fancy_title}}</div>
 <div class="topic-categories">
-  {{bound-category-link item.category
+  {{bound-category-link this.item.category
     recursive=true
     hideParent=true
     link=false
diff --git a/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs b/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
index 1684862836f..8b3225d60f5 100644
--- a/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
+++ b/app/assets/javascripts/select-kit/addon/templates/components/user-chooser/user-row.hbs
@@ -1,7 +1,7 @@
-{{avatar item imageSize="tiny"}}
+{{avatar this.item imageSize="tiny"}}
 
-<span class="username">{{format-username item.username}}</span>
+<span class="username">{{format-username this.item.username}}</span>
 
-{{#if item.name}}
-  <span class="name">{{item.name}}</span>
+{{#if this.item.name}}
+  <span class="name">{{this.item.name}}</span>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/invite-list-user.hbs b/app/assets/javascripts/wizard/addon/templates/components/invite-list-user.hbs
index 790586fa8de..96117b3fe95 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/invite-list-user.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/invite-list-user.hbs
@@ -1,6 +1,6 @@
-<span class="email">{{user.email}}</span>
-<span class="role">{{roleName}}</span>
+<span class="email">{{this.user.email}}</span>
+<span class="role">{{this.roleName}}</span>
 
-<button type="button" class="wizard-btn small danger remove-user" {{action removeUser user}}>
+<button type="button" class="wizard-btn small danger remove-user" {{action this.removeUser this.user}}>
   {{d-icon "times"}}
 </button>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/invite-list.hbs b/app/assets/javascripts/wizard/addon/templates/components/invite-list.hbs
index ab0f13c5c6a..ef466835240 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/invite-list.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/invite-list.hbs
@@ -1,18 +1,18 @@
 
-{{#if users}}
+{{#if this.users}}
   <div class="users-list">
-    {{#each users as |user|}}
-      <InviteListUser @user={{user}} @roles={{roles}} @removeUser={{action "removeUser"}} />
+    {{#each this.users as |user|}}
+      <InviteListUser @user={{user}} @roles={{this.roles}} @removeUser={{action "removeUser"}} />
     {{/each}}
   </div>
 {{/if}}
 
 <div class="new-user">
-  <div class="text-field {{if invalid "invalid"}}">
-    <Input class="invite-email wizard-focusable" @value={{inviteEmail}} placeholder="user@example.com" @tabindex="9" />
+  <div class="text-field {{if this.invalid "invalid"}}">
+    <Input class="invite-email wizard-focusable" @value={{this.inviteEmail}} placeholder="user@example.com" @tabindex="9" />
   </div>
 
-  <ComboBox @value={{inviteRole}} @content={{roles}} @nameProperty="label" @onChange={{action (mut inviteRole)}} />
+  <ComboBox @value={{this.inviteRole}} @content={{this.roles}} @nameProperty="label" @onChange={{action (mut this.inviteRole)}} />
 
   <button type="button" class="wizard-btn small add-user" {{action "addUser"}}>
     {{d-icon "plus"}}{{i18n "wizard.invites.add_user"}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/staff-count.hbs b/app/assets/javascripts/wizard/addon/templates/components/staff-count.hbs
index d75d67fefe2..355c813c589 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/staff-count.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/staff-count.hbs
@@ -1,5 +1,5 @@
-{{#if showStaffCount}}
+{{#if this.showStaffCount}}
   <div class="staff-count">
-    {{i18n "wizard.staff_count" count=field.value}}
+    {{i18n "wizard.staff_count" count=this.field.value}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
index a9600e6bb5f..e490afd1860 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/styling-preview.hbs
@@ -1,18 +1,18 @@
-<div class="previews {{if draggingActive "dragging"}}">
+<div class="previews {{if this.draggingActive "dragging"}}">
   <div class="preview-area topic-preview">
-    <canvas width={{elementWidth}} height={{elementHeight}} style={{canvasStyle}}>
+    <canvas width={{this.elementWidth}} height={{this.elementHeight}} style={{this.canvasStyle}}>
     </canvas>
   </div>
   <div class="preview-area homepage-preview">
-    <HomepagePreview @wizard={{wizard}} @step={{step}} />
+    <HomepagePreview @wizard={{this.wizard}} @step={{this.step}} />
   </div>
 </div>
 
 <div class="preview-nav">
-  <a href class="preview-nav-button {{if previewTopic "active"}}" {{action "setPreviewTopic"}}>
+  <a href class="preview-nav-button {{if this.previewTopic "active"}}" {{action "setPreviewTopic"}}>
     {{i18n "wizard.previews.topic_preview"}}
   </a>
-  <a href class="preview-nav-button {{unless previewTopic "active"}}" {{action "setPreviewHomepage"}}>
+  <a href class="preview-nav-button {{unless this.previewTopic "active"}}" {{action "setPreviewHomepage"}}>
     {{i18n "wizard.previews.homepage_preview"}}
   </a>
 </div>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs
index 2201f2a1a90..e034e5a6e76 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/theme-preview.hbs
@@ -1,8 +1,8 @@
 <div class="preview-area">
   <canvas
-    width={{elementWidth}}
-    height={{elementHeight}}
-    style={{canvasStyle}}
+    width={{this.elementWidth}}
+    height={{this.elementHeight}}
+    style={{this.canvasStyle}}
   >
   </canvas>
 </div>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs
index e2dc7c95db9..7891c517323 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkbox.hbs
@@ -1,4 +1,4 @@
 <label>
-  <Input @type="checkbox" class="wizard-checkbox" @checked={{field.value}} />
-  {{field.placeholder}}
+  <Input @type="checkbox" class="wizard-checkbox" @checked={{this.field.value}} />
+  {{this.field.placeholder}}
 </label>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs
index bff62b8e21f..bcc720a57d0 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-checkboxes.hbs
@@ -1,5 +1,5 @@
-{{#each field.choices as |c|}}
-  <div class="checkbox-field-choice {{fieldClass}}">
+{{#each this.field.choices as |c|}}
+  <div class="checkbox-field-choice {{this.fieldClass}}">
     <label id={{c.id}} value={{c.label}}>
       <Input @type="checkbox" class="wizard-checkbox" @click={{action "changed" value="target"}} @checked={{c.checked}} />
       {{#if c.icon}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs
index 2f7077aef21..7a99c530bc7 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-dropdown.hbs
@@ -1,8 +1,8 @@
 {{component
-  componentName
-  class=fieldClass
-  value=field.value
-  content=field.choices
+  this.componentName
+  class=this.fieldClass
+  value=this.field.value
+  content=this.field.choices
   nameProperty="label"
   tabindex="9"
   onChange=(action "onChangeValue")
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs
index a33d24443f3..efa1c5caae9 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-image.hbs
@@ -1,14 +1,14 @@
-{{#if field.value}}
-  {{component previewComponent field=field fieldClass=fieldClass wizard=wizard}}
+{{#if this.field.value}}
+  {{component this.previewComponent field=this.field fieldClass=this.fieldClass wizard=this.wizard}}
 {{/if}}
 
-<label class="wizard-btn wizard-btn-upload {{if uploading "disabled"}}">
-  {{#if uploading}}
+<label class="wizard-btn wizard-btn-upload {{if this.uploading "disabled"}}">
+  {{#if this.uploading}}
     {{i18n "wizard.uploading"}}
   {{else}}
     {{i18n "wizard.upload"}}
     {{d-icon "far-image"}}
   {{/if}}
 
-  <input class="wizard-hidden-upload-field" disabled={{uploading}} type="file" accept="image/*">
+  <input class="wizard-hidden-upload-field" disabled={{this.uploading}} type="file" accept="image/*">
 </label>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-radio.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-radio.hbs
index 11fedc91cf3..c77e9922620 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-radio.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-radio.hbs
@@ -1,7 +1,7 @@
-{{#each field.choices as |choice|}}
-  <div class="radio-field-choice {{fieldClass}}">
+{{#each this.field.choices as |choice|}}
+  <div class="radio-field-choice {{this.fieldClass}}">
     <div class="radio-area">
-      <RadioButton @selection={{field.value}} @value={{choice.id}} @name={{choice.label}} @onChange={{action "changed"}} />
+      <RadioButton @selection={{this.field.value}} @value={{choice.id}} @name={{choice.label}} @onChange={{action "changed"}} />
 
       <span class="radio-label">
         {{#if choice.icon}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs
index 24ffee721dd..2daac736792 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-text.hbs
@@ -1 +1 @@
-<Input @id={{field.id}} @value={{field.value}} class={{fieldClass}} placeholder={{field.placeholder}} @tabindex="9" />
+<Input @id={{this.field.id}} @value={{this.field.value}} class={{this.fieldClass}} placeholder={{this.field.placeholder}} @tabindex="9" />
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-textarea.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-textarea.hbs
index 3a48e492503..c006b7c71f2 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field-textarea.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field-textarea.hbs
@@ -1 +1 @@
-<Textarea @id={{field.id}} @value={{field.value}} class={{fieldClass}} placeholder={{field.placeholder}} @tabindex="9" />
+<Textarea @id={{this.field.id}} @value={{this.field.value}} class={{this.fieldClass}} placeholder={{this.field.placeholder}} @tabindex="9" />
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs
index 5a5576c834b..3a9c961b124 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-field.hbs
@@ -1,31 +1,31 @@
-<label for={{field.id}}>
+<label for={{this.field.id}}>
   <span class="label-value">
-    {{field.label}}
+    {{this.field.label}}
 
-    {{#if field.required}}
+    {{#if this.field.required}}
       <span class="field-required">*</span>
     {{/if}}
   </span>
 
-  {{#if field.description}}
-    <div class="field-description">{{html-safe field.description}}</div>
+  {{#if this.field.description}}
+    <div class="field-description">{{html-safe this.field.description}}</div>
   {{/if}}
 </label>
 
 <div class="input-area">
   {{component
-    inputComponentName
-    field=field
-    step=step
-    fieldClass=fieldClass
-    wizard=wizard
+    this.inputComponentName
+    field=this.field
+    step=this.step
+    fieldClass=this.fieldClass
+    wizard=this.wizard
   }}
 </div>
 
-{{#if field.errorDescription}}
-  <div class="field-error-description">{{html-safe field.errorDescription}}</div>
+{{#if this.field.errorDescription}}
+  <div class="field-error-description">{{html-safe this.field.errorDescription}}</div>
 {{/if}}
 
-{{#if field.extra_description}}
-  <div class="field-extra-description">{{html-safe field.extra_description}}</div>
+{{#if this.field.extra_description}}
+  <div class="field-extra-description">{{html-safe this.field.extra_description}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs
index c046ed5795c..c40f6914a85 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-image-preview.hbs
@@ -1 +1 @@
-<img src={{field.value}} class={{fieldClass}}>
+<img src={{this.field.value}} class={{this.fieldClass}}>
diff --git a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
index 15e49ddd48b..a303a292846 100644
--- a/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/components/wizard-step.hbs
@@ -1,32 +1,32 @@
 <div class="wizard-step-contents">
-  {{#if step.title}}
-    <h1 class="wizard-step-title">{{step.title}}</h1>
+  {{#if this.step.title}}
+    <h1 class="wizard-step-title">{{this.step.title}}</h1>
   {{/if}}
 
-  <div class={{bannerAndDescriptionClass}}>
-    {{#if bannerImage}}
-      <img src={{bannerImage}} class="wizard-step-banner">
+  <div class={{this.bannerAndDescriptionClass}}>
+    {{#if this.bannerImage}}
+      <img src={{this.bannerImage}} class="wizard-step-banner">
     {{/if}}
 
-    {{#if step.description}}
-      <p class="wizard-step-description">{{html-safe step.description}}</p>
+    {{#if this.step.description}}
+      <p class="wizard-step-description">{{html-safe this.step.description}}</p>
     {{/if}}
   </div>
 
-  <WizardStepForm @step={{step}}>
-    {{#if includeSidebar}}
+  <WizardStepForm @step={{this.step}}>
+    {{#if this.includeSidebar}}
       <div class="wizard-fields-sidebar">
-        {{#each step.fields as |field|}}
+        {{#each this.step.fields as |field|}}
           {{#if field.show_in_sidebar}}
-            <WizardField @field={{field}} @step={{step}} @wizard={{wizard}} />
+            <WizardField @field={{field}} @step={{this.step}} @wizard={{this.wizard}} />
           {{/if}}
         {{/each}}
       </div>
     {{/if}}
     <div class="wizard-fields-main">
-      {{#each step.fields as |field|}}
+      {{#each this.step.fields as |field|}}
         {{#unless field.show_in_sidebar}}
-          <WizardField @field={{field}} @step={{step}} @wizard={{wizard}} />
+          <WizardField @field={{field}} @step={{this.step}} @wizard={{this.wizard}} />
         {{/unless}}
       {{/each}}
     </div>
@@ -37,35 +37,35 @@
 
   <div class="wizard-progress">
     <div class="white"></div>
-    <div style={{barStyle}} class="black"></div>
+    <div style={{this.barStyle}} class="black"></div>
     <div class="screen"></div>
-    <span>{{bound-i18n "wizard.step" current=step.displayIndex total=wizard.totalSteps}}</span>
+    <span>{{bound-i18n "wizard.step" current=this.step.displayIndex total=this.wizard.totalSteps}}</span>
   </div>
 
   <div class="wizard-buttons">
-    {{#if showQuitButton}}
+    {{#if this.showQuitButton}}
       <a href {{action "quit"}} tabindex="11" class="action-link quit">{{i18n "wizard.quit"}}</a>
     {{/if}}
 
-    {{#if showFinishButton}}
-      <button {{action "exitEarly"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn finish">
+    {{#if this.showFinishButton}}
+      <button {{action "exitEarly"}} disabled={{this.saving}} tabindex="10" type="button" class="wizard-btn finish">
         {{i18n "wizard.finish"}}
       </button>
     {{/if}}
 
-    {{#if showBackButton}}
+    {{#if this.showBackButton}}
       <a href {{action "backStep"}} tabindex="11" class="action-link back">{{i18n "wizard.back"}}</a>
     {{/if}}
 
-    {{#if showNextButton}}
-      <button {{action "nextStep"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn next primary">
+    {{#if this.showNextButton}}
+      <button {{action "nextStep"}} disabled={{this.saving}} tabindex="10" type="button" class="wizard-btn next primary">
         {{i18n "wizard.next"}}
         {{d-icon "chevron-right"}}
       </button>
     {{/if}}
 
-    {{#if showDoneButton}}
-      <button {{action "quit"}} disabled={{saving}} tabindex="10" type="button" class="wizard-btn done">
+    {{#if this.showDoneButton}}
+      <button {{action "quit"}} disabled={{this.saving}} tabindex="10" type="button" class="wizard-btn done">
         {{i18n "wizard.done"}}
       </button>
     {{/if}}
diff --git a/app/assets/javascripts/wizard/addon/templates/step.hbs b/app/assets/javascripts/wizard/addon/templates/step.hbs
index c3276fe5b4f..fed149d9d62 100644
--- a/app/assets/javascripts/wizard/addon/templates/step.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/step.hbs
@@ -1 +1 @@
-<WizardStep @step={{step}} @wizard={{wizard}} @goNext={{action "goNext"}} @goBack={{action "goBack"}} />
+<WizardStep @step={{this.step}} @wizard={{this.wizard}} @goNext={{action "goNext"}} @goBack={{action "goBack"}} />
diff --git a/app/assets/javascripts/wizard/addon/templates/wizard.hbs b/app/assets/javascripts/wizard/addon/templates/wizard.hbs
index 3ab8b2a2e2c..fcf1629271e 100644
--- a/app/assets/javascripts/wizard/addon/templates/wizard.hbs
+++ b/app/assets/javascripts/wizard/addon/templates/wizard.hbs
@@ -1,5 +1,5 @@
 <div id="wizard-main">
-  {{#if showCanvas}}
+  {{#if this.showCanvas}}
     <WizardCanvas />
   {{/if}}
 
@@ -9,7 +9,7 @@
 
       {{!-- Load all font styles --}}
       <div class="preloaded-font-styles">
-        {{#each fontClasses as |fontClass|}}
+        {{#each this.fontClasses as |fontClass|}}
           <span class={{fontClass}}>&nbsp;</span>
           <strong class={{fontClass}}>&nbsp;</strong>
         {{/each}}
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index f2e54fc3baf..78410393528 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -1,11 +1,11 @@
 <DModalBody @title="discourse_local_dates.title" @class="discourse-local-dates-create-modal" @style="overflow: auto">
 
   <div class="form">
-    {{#if isValid}}
-      {{#if timezoneIsDifferentFromUserTimezone}}
+    {{#if this.isValid}}
+      {{#if this.timezoneIsDifferentFromUserTimezone}}
         <div class="preview alert alert-info">
           {{i18n "discourse_local_dates.create.form.current_timezone"}}
-          <b>{{formattedCurrentUserTimezone}}</b>{{currentPreview}}
+          <b>{{this.formattedCurrentUserTimezone}}</b>{{this.currentPreview}}
         </div>
       {{/if}}
     {{else}}
@@ -14,72 +14,72 @@
       </div>
     {{/if}}
 
-    {{computeDate}}
+    {{this.computeDate}}
 
     <div class="date-time-configuration">
       <div class="inputs-panel">
-        <div class="date-time-control from {{if fromSelected "is-selected"}} {{if fromFilled "is-filled"}}">
+        <div class="date-time-control from {{if this.fromSelected "is-selected"}} {{if this.fromFilled "is-filled"}}">
           {{d-icon "calendar-alt"}}
           <DButton
             @id="from-date-time"
             @action={{action "focusFrom"}}
-            @translatedLabel={{formattedFrom}}
+            @translatedLabel={{this.formattedFrom}}
             @class="date-time" />
         </div>
 
-        <div class="date-time-control to {{if toSelected "is-selected"}} {{if toFilled "is-filled"}}">
+        <div class="date-time-control to {{if this.toSelected "is-selected"}} {{if this.toFilled "is-filled"}}">
           {{d-icon "calendar-alt"}}
           <DButton
             @action={{action "focusTo"}}
-            @translatedLabel={{formattedTo}}
+            @translatedLabel={{this.formattedTo}}
             @class="date-time" />
-          {{#if toFilled}}
+          {{#if this.toFilled}}
             <DButton @icon="times" action={{action "eraseToDateTime"}} @class="delete-to-date" />
           {{/if}}
         </div>
 
-        {{#unless site.mobileView}}
+        {{#unless this.site.mobileView}}
           <TimezoneInput
             @options={{hash icon="globe"}}
-            @value={{timezone}}
-            @onChange={{action (mut timezone)}}
+            @value={{this.timezone}}
+            @onChange={{action (mut this.timezone)}}
           />
         {{/unless}}
       </div>
 
       <div class="picker-panel">
         <Input @class="fake-input" />
-        <div class="date-picker" id="picker-container-{{elementId}}"></div>
+        <div class="date-picker" id="picker-container-{{this.elementId}}"></div>
 
-        {{#if fromSelected}}
+        {{#if this.fromSelected}}
           <div class="time-pickers">
             {{d-icon "far-clock"}}
-            <Input @maxlength={{5}} @placeholder="hh:mm" @input={{action "setTime"}} @type="time" @value={{time}} @class="time-picker" />
+            <Input @maxlength={{5}} @placeholder="hh:mm" @input={{action "setTime"}} @type="time" @value={{this.time}} @class="time-picker" />
           </div>
         {{/if}}
 
-        {{#if toSelected}}
-          {{#if toDate}}
+        {{#if this.toSelected}}
+          {{#if this.toDate}}
             <div class="time-pickers">
               {{d-icon "far-clock"}}
-              <Input @maxlength={{5}} @placeholder="hh:mm" @input={{action "setToTime"}} @type="time" @value={{toTime}} @class="time-picker" />
+              <Input @maxlength={{5}} @placeholder="hh:mm" @input={{action "setToTime"}} @type="time" @value={{this.toTime}} @class="time-picker" />
             </div>
           {{/if}}
         {{/if}}
       </div>
 
-      {{#if site.mobileView}}
+      {{#if this.site.mobileView}}
         <TimezoneInput
-          @value={{timezone}}
+          @value={{this.timezone}}
           @options={{hash icon="globe"}}
-          @onChange={{action (mut timezone)}}
+          @onChange={{action (mut this.timezone)}}
         />
       {{/if}}
     </div>
 
-    {{#if advancedMode}}
+    {{#if this.advancedMode}}
       <div class="advanced-options">
-        {{#unless isRange}}
+        {{#unless this.isRange}}
           <div class="control-group recurrence">
             <label class="control-label">
               {{i18n "discourse_local_dates.create.form.recurring_title"}}
@@ -87,10 +87,10 @@
             <p>{{html-safe (i18n "discourse_local_dates.create.form.recurring_description")}}</p>
             <div class="controls">
               <ComboBox
-                @content={{recurringOptions}}
+                @content={{this.recurringOptions}}
                 @class="recurrence-input"
-                @value={{recurring}}
-                @onChange={{action (mut recurring)}}
+                @value={{this.recurring}}
+                @onChange={{action (mut this.recurring)}}
                 @options={{hash
                   none="discourse_local_dates.create.form.recurring_none"
                 }}
@@ -108,14 +108,14 @@
             </a>
           </p>
           <div class="controls">
-            <TextField @value={{format}} @class="format-input" />
+            <TextField @value={{this.format}} @class="format-input" />
           </div>
         </div>
         <div class="control-group">
           <ul class="formats">
-            {{#each previewedFormats as |previewedFormat|}}
+            {{#each this.previewedFormats as |previewedFormat|}}
               <li class="format">
-                <a class="moment-format" href {{action (mut format) previewedFormat.format}}>
+                <a class="moment-format" href {{action (mut this.format) previewedFormat.format}}>
                   {{previewedFormat.format}}
                 </a>
                 <span class="previewed-format">
@@ -134,8 +134,8 @@
               @valueProperty={{null}}
               @nameProperty={{null}}
               @class="timezones-input"
-              @content={{allTimezones}}
-              @value={{timezones}}
+              @content={{this.allTimezones}}
+              @value={{this.timezones}}
               @options={{hash
                 allowAny=false
                 maximum=5
@@ -149,7 +149,7 @@
 </DModalBody>
 
 <div class="modal-footer discourse-local-dates-create-modal-footer">
-  {{#if isValid}}
+  {{#if this.isValid}}
     <DButton
       @class="btn-primary"
       @action={{action "save"}}
@@ -164,5 +164,5 @@
     @class="btn-default advanced-mode-btn"
     @action={{action "advancedMode"}}
     @icon="cog"
-    @label={{toggleModeBtnLabel}} />
+    @label={{this.toggleModeBtnLabel}} />
 </div>
diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs
index a811468a3d4..8bb0cf87843 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/modal/discourse-local-dates-create-modal.hbs
@@ -1 +1 @@
-<DiscourseLocalDatesCreateForm @config={{config}} @insertDate={{insertDate}} />
+<DiscourseLocalDatesCreateForm @config={{this.config}} @insertDate={{this.insertDate}} />
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
index 08b98e7bf89..448a907fc78 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/composer-presence-display.hbs
@@ -1,16 +1,16 @@
-{{#if shouldDisplay}}
+{{#if this.shouldDisplay}}
   <div class="presence-users">
     <div class="presence-avatars">
-      {{#each presenceUsers as |user|}}
+      {{#each this.presenceUsers as |user|}}
         {{avatar user imageSize="small"}}
       {{/each}}
     </div>
     <span class="presence-text">
       <span class="description">
-        {{#if isReply ~}}
-          {{i18n "presence.replying" count=presenceUsers.length}}
+        {{#if this.isReply ~}}
+          {{i18n "presence.replying" count=this.presenceUsers.length}}
         {{~else~}}
-          {{i18n "presence.editing" count=presenceUsers.length}}
+          {{i18n "presence.editing" count=this.presenceUsers.length}}
         {{~/if}}
         {{~""~}}
       </span>
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
index 6fef85897b1..f8fecd12e3f 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
@@ -1,14 +1,14 @@
-{{#if shouldDisplay}}
+{{#if this.shouldDisplay}}
   <div class="presence-users">
     <div class="presence-avatars">
-      {{#each users as |user|}}
+      {{#each this.users as |user|}}
         <UserLink @user={{user}}>
           {{avatar user imageSize="small"}}
         </UserLink>
       {{/each}}
     </div>
     <span class="presence-text">
-      <span class="description">{{i18n "presence.replying_to_topic" count=users.length}}</span>{{!-- (using comment to stop whitespace)
+      <span class="description">{{i18n "presence.replying_to_topic" count=this.users.length}}</span>{{!-- (using comment to stop whitespace)
   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span></span>
     </span>
   </div>
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs
index 712a0115162..668b62ba2e7 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/before-composer-controls/presence.hbs
@@ -1 +1 @@
-<ComposerPresenceDisplay @model={{model}} />
+<ComposerPresenceDisplay @model={{this.model}} />
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
index e4ec63b85be..7e32875b657 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/connectors/topic-above-footer-buttons/presence.hbs
@@ -1,2 +1,2 @@
 {{!-- Note: the topic-above-footer-buttons outlet is only rendered for logged-in users --}}
-<TopicPresenceDisplay @topic={{model}} />
+<TopicPresenceDisplay @topic={{this.model}} />
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
index 80431a13354..749c2c55f03 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
@@ -8,7 +8,7 @@
   <span class="poll-breakdown-option-color" style={{this.colorPreviewStyle}}></span>
 
   <span class="poll-breakdown-option-count">
-    {{#if showPercentage}}
+    {{#if this.showPercentage}}
       {{this.percent}}%
     {{else}}
       {{@option.votes}}
diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
index 186803231b6..14c3ea6edb1 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs
@@ -1,119 +1,118 @@
 <DModalBody @title="poll.ui_builder.title" @class="poll-ui-builder">
   <div class="input-group poll-type">
-    <a href {{action (mut pollType) "regular"}} class="poll-type-value {{if isRegular "active"}}">
+    <a href {{action (mut this.pollType) "regular"}} class="poll-type-value {{if this.isRegular "active"}}">
       {{i18n "poll.ui_builder.poll_type.regular"}}
     </a>
 
-    <a href {{action (mut pollType) "multiple"}} class="poll-type-value {{if isMultiple "active"}}">
+    <a href {{action (mut this.pollType) "multiple"}} class="poll-type-value {{if this.isMultiple "active"}}">
       {{i18n "poll.ui_builder.poll_type.multiple"}}
     </a>
 
-    {{#if showNumber}}
-      <a href {{action (mut pollType) "number"}} class="poll-type-value {{if isNumber "active"}}">
+    {{#if this.showNumber}}
+      <a href {{action (mut this.pollType) "number"}} class="poll-type-value {{if this.isNumber "active"}}">
         {{i18n "poll.ui_builder.poll_type.number"}}
       </a>
     {{/if}}
   </div>
 
-  {{#if showAdvanced}}
+  {{#if this.showAdvanced}}
     <div class="input-group poll-title">
       <label class="input-group-label">{{i18n "poll.ui_builder.poll_title.label"}}</label>
-      <Input @value={{pollTitle}} />
+      <Input @value={{this.pollTitle}} />
     </div>
   {{/if}}
 
-  {{#unless isNumber}}
+  {{#unless this.isNumber}}
     <div class="poll-options">
-      {{#if showAdvanced}}
+      {{#if this.showAdvanced}}
         <label class="input-group-label">{{i18n "poll.ui_builder.poll_options.label"}}</label>
-        <Textarea @value={{pollOptionsText}} @input={{action "onOptionsTextChange"}} />
-
-        {{#if showMinNumOfOptionsValidation}}
-          {{#unless minNumOfOptionsValidation.ok}}
-            <InputTip @validation={{minNumOfOptionsValidation}} />
+        <Textarea @value={{this.pollOptionsText}} @input={{action "onOptionsTextChange"}} />
+        {{#if this.showMinNumOfOptionsValidation}}
+          {{#unless this.minNumOfOptionsValidation.ok}}
+            <InputTip @validation={{this.minNumOfOptionsValidation}} />
           {{/unless}}
         {{/if}}
       {{else}}
-        {{#each pollOptions as |option|}}
+        {{#each this.pollOptions as |option|}}
           <div class="input-group poll-option-value">
             <Input @value={{option.value}} @enter={{action "addOption" option}} />
-            {{#if canRemoveOption}}
+            {{#if this.canRemoveOption}}
               <DButton @icon="trash-alt" @action={{action "removeOption" option}} />
             {{/if}}
           </div>
         {{/each}}
 
         <div class="poll-option-controls">
-          <DButton @class="btn-default" @icon="plus" @label="poll.ui_builder.poll_options.add" @action={{action "addOption" pollOptions.lastObject}} />
-          {{#if (and showMinNumOfOptionsValidation (not minNumOfOptionsValidation.ok))}}
-            <InputTip @validation={{minNumOfOptionsValidation}} />
+          <DButton @class="btn-default" @icon="plus" @label="poll.ui_builder.poll_options.add" @action={{action "addOption" this.pollOptions.lastObject}} />
+          {{#if (and this.showMinNumOfOptionsValidation (not this.minNumOfOptionsValidation.ok))}}
+            <InputTip @validation={{this.minNumOfOptionsValidation}} />
           {{/if}}
         </div>
       {{/if}}
     </div>
   {{/unless}}
 
-  {{#unless isRegular}}
+  {{#unless this.isRegular}}
     <div class="options">
       <div class="input-group poll-number">
         <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.min"}}</label>
-        <Input @type="number" @value={{pollMin}} @valueProperty="value" class="poll-options-min" @min={{1}} />
+        <Input @type="number" @value={{this.pollMin}} @valueProperty="value" class="poll-options-min" @min={{1}} />
       </div>
 
       <div class="input-group poll-number">
         <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.max"}}</label>
-        <Input @type="number" @value={{pollMax}} @valueProperty="value" class="poll-options-max" @min={{1}} />
+        <Input @type="number" @value={{this.pollMax}} @valueProperty="value" class="poll-options-max" @min={{1}} />
       </div>
 
-      {{#if isNumber}}
+      {{#if this.isNumber}}
         <div class="input-group poll-number">
           <label class="input-group-label">{{i18n "poll.ui_builder.poll_config.step"}}</label>
-          <Input @type="number" @value={{pollStep}} @valueProperty="value" @min="1" class="poll-options-step" />
+          <Input @type="number" @value={{this.pollStep}} @valueProperty="value" @min="1" class="poll-options-step" />
         </div>
       {{/if}}
     </div>
 
-    {{#unless minMaxValueValidation.ok}}
-      <InputTip @validation={{minMaxValueValidation}} />
+    {{#unless this.minMaxValueValidation.ok}}
+      <InputTip @validation={{this.minMaxValueValidation}} />
     {{/unless}}
   {{/unless}}
 
-  {{#if showAdvanced}}
+  {{#if this.showAdvanced}}
     <div class="input-group poll-allowed-groups">
       <label class="input-group-label">{{i18n "poll.ui_builder.poll_groups.label"}}</label>
-      <GroupChooser @content={{siteGroups}} @value={{pollGroups}} @onChange={{action (mut pollGroups)}} @labelProperty="name" @valueProperty="name" />
+      <GroupChooser @content={{this.siteGroups}} @value={{this.pollGroups}} @onChange={{action (mut this.pollGroups)}} @labelProperty="name" @valueProperty="name" />
     </div>
 
     <div class="input-group poll-date">
       <label class="input-group-label">{{i18n "poll.ui_builder.automatic_close.label"}}</label>
-      <DateTimeInput @date={{pollAutoClose}} @onChange={{action (mut pollAutoClose)}} @clearable={{true}} @useGlobalPickerContainer={{true}} />
+      <DateTimeInput @date={{this.pollAutoClose}} @onChange={{action (mut this.pollAutoClose)}} @clearable={{true}} @useGlobalPickerContainer={{true}} />
     </div>
 
     <div class="input-group poll-select">
       <label class="input-group-label">{{i18n "poll.ui_builder.poll_result.label"}}</label>
-      <ComboBox @content={{pollResults}} @value={{pollResult}} @class="poll-result" @valueProperty="value" @onChange={{action (mut pollResult)}} />
+      <ComboBox @content={{this.pollResults}} @value={{this.pollResult}} @class="poll-result" @valueProperty="value" @onChange={{action (mut this.pollResult)}} />
     </div>
 
-    {{#unless isNumber}}
+    {{#unless this.isNumber}}
       <div class="input-group poll-select column">
         <label class="input-group-label">{{i18n "poll.ui_builder.poll_chart_type.label"}}</label>
 
         <div class="radio-group">
-          <RadioButton @id="poll-chart-type-bar" @name="poll-chart-type" @value="bar" @selection={{chartType}} />
+          <RadioButton @id="poll-chart-type-bar" @name="poll-chart-type" @value="bar" @selection={{this.chartType}} />
           <label for="poll-chart-type-bar">{{d-icon "chart-bar"}} {{i18n "poll.ui_builder.poll_chart_type.bar"}}</label>
         </div>
 
         <div class="radio-group">
-          <RadioButton @id="poll-chart-type-pie" @name="poll-chart-type" @value="pie" @selection={{chartType}} />
+          <RadioButton @id="poll-chart-type-pie" @name="poll-chart-type" @value="pie" @selection={{this.chartType}} />
           <label for="poll-chart-type-pie">{{d-icon "chart-pie"}} {{i18n "poll.ui_builder.poll_chart_type.pie"}}</label>
         </div>
       </div>
     {{/unless}}
 
-    {{#unless isPie}}
+    {{#unless this.isPie}}
       <div class="input-group poll-checkbox column">
         <label>
-          <Input @type="checkbox" @checked={{publicPoll}} />
+          <Input @type="checkbox" @checked={{this.publicPoll}} />
           {{i18n "poll.ui_builder.poll_public.label"}}
         </label>
       </div>
@@ -122,9 +121,9 @@
 </DModalBody>
 
 <div class="modal-footer">
-  <DButton @action={{action "insertPoll"}} @icon="chart-bar" @class="btn-primary" @label="poll.ui_builder.insert" @disabled={{disableInsert}} />
+  <DButton @action={{action "insertPoll"}} @icon="chart-bar" @class="btn-primary" @label="poll.ui_builder.insert" @disabled={{this.disableInsert}} />
 
   <DButton @label="cancel" @class="btn-flat" @action={{route-action "closeModal"}} />
 
-  <DButton @action={{action "toggleAdvanced"}} @class="btn-default show-advanced" @icon="cog" @title={{if showAdvanced "poll.ui_builder.hide_advanced" "poll.ui_builder.show_advanced"}} />
+  <DButton @action={{action "toggleAdvanced"}} @class="btn-default show-advanced" @icon="cog" @title={{if this.showAdvanced "poll.ui_builder.hide_advanced" "poll.ui_builder.show_advanced"}} />
 </div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
index 9756fd02110..81b59825edc 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/color-example.hbs
@@ -1,2 +1,2 @@
-<div class="color-bg {{color}}"></div>
-<div class="color-name">var(--{{color}})</div>
+<div class="color-bg {{this.color}}"></div>
+<div class="color-name">var(--{{this.color}})</div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
index 8289e4da448..c79fd542a27 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-example.hbs
@@ -1,2 +1,2 @@
-<div class="example-title">{{title}}</div>
+<div class="example-title">{{this.title}}</div>
 <section class="rendered">{{yield this.value}}</section>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
index 4b0bf42fab7..a5cfe3438fb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-icons.hbs
@@ -1,4 +1,4 @@
-{{#each iconIds as |id|}}
+{{#each this.iconIds as |id|}}
   <div class="styleguide-icon">
     {{d-icon id}}
     <span>{{id}}</span>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs
index 7d6e8106637..db00679b81f 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-link.hbs
@@ -1,3 +1,3 @@
-<LinkTo @route="styleguide.show" @models={{array section.category section.id}}>
-  {{section-title section.id}}
+<LinkTo @route="styleguide.show" @models={{array this.section.category this.section.id}}>
+  {{section-title this.section.id}}
 </LinkTo>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs
index 31264c06339..214dd0b1296 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/components/styleguide-section.hbs
@@ -1,8 +1,8 @@
 <h1 class="section-title">
-  {{#if section}}
-    {{section-title section.id}}
+  {{#if this.section}}
+    {{section-title this.section.id}}
   {{else}}
-    {{i18n title}}
+    {{i18n this.title}}
   {{/if}}
 </h1>
 
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
index 4ddd5d0cdd8..3397038c173 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide.hbs
@@ -1,6 +1,6 @@
 <section class="styleguide">
   <section class="styleguide-menu">
-    {{#each categories as |c|}}
+    {{#each this.categories as |c|}}
       <ul>
         <li class="styleguide-heading">{{i18n (concat "styleguide.categories." c.id)}}</li>
         {{#each c.sections as |s|}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs
index bd41fb226f9..258d7aa24cb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/02-buttons.hbs
@@ -1,71 +1,71 @@
 <StyleguideExample @title=".btn-icon - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <DButton @icon="times" @translatedTitle={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-icon - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <DButton @icon="times" @translatedTitle={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-text - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <DButton @translatedLabel={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-text - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <DButton @translatedLabel={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-default .btn-icon-text - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <DButton @icon="plus" @translatedLabel={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-default .btn-icon-text - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <DButton @icon="plus" @translatedLabel={{bs.text}} @class={{bs.class}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-primary .btn-icon-text - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <DButton @class={{concat "btn-primary " bs.class}} @icon="plus" @translatedLabel={{bs.text}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-primary .btn-icon-text - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <DButton @class={{concat "btn-primary " bs.class}} @icon="plus" @translatedLabel={{bs.text}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-danger .btn-icon-text - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <DButton @class={{concat "btn-danger " bs.class}} @icon="trash-alt" @translatedLabel={{bs.text}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-danger .btn-icon-text - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <DButton @class={{concat "btn-danger " bs.class}} @icon="trash-alt" @translatedLabel={{bs.text}} @disabled={{bs.disabled}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-flat - sizes (large, default, small)">
-  {{#each dummy.buttonSizes as |bs|}}
+  {{#each this.dummy.buttonSizes as |bs|}}
     <FlatButton @icon="trash-alt" @disabled={{bs.disabled}} @translatedTitle={{bs.title}} />
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title=".btn-flat - states">
-  {{#each dummy.buttonStates as |bs|}}
+  {{#each this.dummy.buttonStates as |bs|}}
     <FlatButton @icon="trash-alt" @disabled={{bs.disabled}} @translatedTitle={{bs.title}} />
   {{/each}}
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs
index 340c12a7bbd..38817807f59 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/05-input-fields.hbs
@@ -37,10 +37,10 @@
   </div>
 </StyleguideExample>
 
-<StyleguideExample @title="inline-form with combo-box" @initialValue={{dummy.options.[0].name}} as |value|>
+<StyleguideExample @title="inline-form with combo-box" @initialValue={{this.dummy.options.[0].name}} as |value|>
   <div class="inline-form">
     <TextField @placeholder="Placeholder" />
-    <ComboBox @content={{dummy.options}} @value={{value}} @onChange={{fn (mut value)}} />
+    <ComboBox @content={{this.dummy.options}} @value={{value}} @onChange={{fn (mut value)}} />
     <DButton @class="btn-primary" @icon="search" @type="submit" @translatedLabel="Submit" />
   </div>
 </StyleguideExample>
@@ -48,7 +48,7 @@
 <StyleguideExample @title="inline-form with multi-select">
   <div class="inline-form">
     <TextField />
-    <MultiSelect @content={{dummy.options}} @onChange={{action "dummy"}} />
+    <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
     <DButton @class="btn-primary" @icon="search" @type="submit" @translatedLabel="Submit" />
   </div>
 </StyleguideExample>
@@ -57,7 +57,7 @@
   <div class="inline-form">
     <label>Text:</label>
     <TextField />
-    <MultiSelect @content={{dummy.options}} @onChange={{action "dummy"}} />
+    <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
     <DButton @class="btn-primary" @icon="search" @type="submit" @translatedLabel="Submit" />
   </div>
 </StyleguideExample>
@@ -70,7 +70,7 @@
 
 <StyleguideExample @title="category-notifications-button and regular button">
   <div class="inline-form">
-    <CategoryNotificationsButton @category={{dummy.categories.[0]}} @value={{1}} @onChange={{action "dummy"}} />
+    <CategoryNotificationsButton @category={{this.dummy.categories.[0]}} @value={{1}} @onChange={{action "dummy"}} />
     <DButton @icon="reply" @type="submit" @translatedLabel="Button" />
   </div>
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
index fd904f80019..2d2fca51003 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/dropdowns.hbs
@@ -1,37 +1,37 @@
-<StyleguideExample @title="combo-box" @initialValue={{dummy.options.[0].name}} as |value|>
-  <ComboBox @content={{dummy.options}} @value={{value}} @onChange={{fn (mut value)}} />
+<StyleguideExample @title="combo-box" @initialValue={{this.dummy.options.[0].name}} as |value|>
+  <ComboBox @content={{this.dummy.options}} @value={{value}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
-<StyleguideExample @title="filterable combo-box" @initialValue={{dummy.categories.[0].name}} as |value|>
-  <ComboBox @content={{dummy.categories}} @value={{value}} @options={{hash filterable=true}} @onChange={{fn (mut value)}} />
+<StyleguideExample @title="filterable combo-box" @initialValue={{this.dummy.categories.[0].name}} as |value|>
+  <ComboBox @content={{this.dummy.categories}} @value={{value}} @options={{hash filterable=true}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
-<StyleguideExample @title="combo-box with a default state" @initialValue={{dummy.options.[0].name}} as |value|>
-  <ComboBox @content={{dummy.options}} @value={{value}} @options={{hash none="category.none"}} @onChange={{fn (mut value)}} />
+<StyleguideExample @title="combo-box with a default state" @initialValue={{this.dummy.options.[0].name}} as |value|>
+  <ComboBox @content={{this.dummy.options}} @value={{value}} @options={{hash none="category.none"}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
-<StyleguideExample @title="combo-box clearable" @initialValue={{dummy.options.[0].name}} as |value|>
-  <ComboBox @content={{dummy.options}} @clearable={{true}} @value={{value}} @options={{hash none="category.none"}} @onChange={{fn (mut value)}} />
+<StyleguideExample @title="combo-box clearable" @initialValue={{this.dummy.options.[0].name}} as |value|>
+  <ComboBox @content={{this.dummy.options}} @clearable={{true}} @value={{value}} @options={{hash none="category.none"}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
 <StyleguideExample @title="topic-notifications-options" @initialValue={{1}} as |value|>
-  <TopicNotificationsOptions @topic={{dummy.topic}} @value={{value}} @onChange={{fn (mut value)}} />
+  <TopicNotificationsOptions @topic={{this.dummy.topic}} @value={{value}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
 <StyleguideExample @title="topic-footer-mobile-dropdown">
-  <TopicFooterMobileDropdown @topic={{dummy.topic}} />
+  <TopicFooterMobileDropdown @topic={{this.dummy.topic}} />
 </StyleguideExample>
 
-<StyleguideExample @title="category-chooser" @initialValue={{categories.[0].name}} as |value|>
+<StyleguideExample @title="category-chooser" @initialValue={{this.categories.[0].name}} as |value|>
   <CategoryChooser @value={{value}} @onChange={{fn (mut value)}} />
 </StyleguideExample>
 
 <StyleguideExample @title="pinned-button">
-  <PinnedButton @topic={{dummy.pinnedTopic}} />
+  <PinnedButton @topic={{this.dummy.pinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="pinned-options">
-  <PinnedOptions @topic={{dummy.pinnedTopic}} />
+  <PinnedOptions @topic={{this.dummy.pinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="categories-admin-dropdown">
@@ -39,7 +39,7 @@
 </StyleguideExample>
 
 <StyleguideExample @title="category-notifications-button">
-  <CategoryNotificationsButton @category={{dummy.categories.[0]}} @value={{1}} @onChange={{action "dummy"}} />
+  <CategoryNotificationsButton @category={{this.dummy.categories.[0]}} @value={{1}} @onChange={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="notifications-button">
@@ -47,31 +47,31 @@
 </StyleguideExample>
 
 <StyleguideExample @title="dropdown-select-box">
-  <DropdownSelectBox @content={{dummy.options}} @onChange={{action "dummy"}} @options={{hash
+  <DropdownSelectBox @content={{this.dummy.options}} @onChange={{action "dummy"}} @options={{hash
       translatedNone="Something"
     }} />
 </StyleguideExample>
 
 <StyleguideExample @title="future-date-input-selector">
-  <FutureDateInputSelector @input={{dummy.topicTimerUpdateDate}} @includeWeekend={{true}} @includeForever={{true}} @options={{hash none="time_shortcut.select_timeframe"}} />
+  <FutureDateInputSelector @input={{this.dummy.topicTimerUpdateDate}} @includeWeekend={{true}} @includeForever={{true}} @options={{hash none="time_shortcut.select_timeframe"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="multi-select">
-  <MultiSelect @content={{dummy.options}} @onChange={{action "dummy"}} />
+  <MultiSelect @content={{this.dummy.options}} @onChange={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="admin group-chooser">
-  <GroupChooser @selected={{dummy.selectedGroups}} @content={{dummy.groups}} @onChange={{action "dummy"}} />
+  <GroupChooser @selected={{this.dummy.selectedGroups}} @content={{this.dummy.groups}} @onChange={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="list-setting">
-  <ListSetting @settingValue={{dummy.settings}} @onChange={{action "dummy"}} />
+  <ListSetting @settingValue={{this.dummy.settings}} @onChange={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="list-setting with colors">
-  <ListSetting @settingValue={{dummy.colors}} @nameProperty="color" @onChange={{action "dummy"}} />
+  <ListSetting @settingValue={{this.dummy.colors}} @nameProperty="color" @onChange={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="user-notifications-dropdown">
-  <UserNotificationsDropdown @user={{currentUser}} @value="changeToNormal" />
+  <UserNotificationsDropdown @user={{this.currentUser}} @value="changeToNormal" />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs
index 55eea35207e..617904b5912 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-link.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="topic-link">
-  {{topic-link dummy.topic}}
+  {{topic-link this.dummy.topic}}
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs
index 4153318992b..606b2cbcd15 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/atoms/topic-statuses.hbs
@@ -1,27 +1,27 @@
 <StyleguideExample @title="invisible">
-  <TopicStatus @topic={{dummy.invisibleTopic}} />
+  <TopicStatus @topic={{this.dummy.invisibleTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="closed">
-  <TopicStatus @topic={{dummy.closedTopic}} />
+  <TopicStatus @topic={{this.dummy.closedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="pinned">
-  <TopicStatus @topic={{dummy.pinnedTopic}} />
+  <TopicStatus @topic={{this.dummy.pinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="unpinned">
-  <TopicStatus @topic={{dummy.unpinnedTopic}} />
+  <TopicStatus @topic={{this.dummy.unpinnedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="archived">
-  <TopicStatus @topic={{dummy.archivedTopic}} />
+  <TopicStatus @topic={{this.dummy.archivedTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="warning">
-  <TopicStatus @topic={{dummy.warningTopic}} />
+  <TopicStatus @topic={{this.dummy.warningTopic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="no status">
-  <TopicStatus @topic={{dummy.topic}} />
+  <TopicStatus @topic={{this.dummy.topic}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs
index 6b14e74784c..30d8b09a287 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/bread-crumbs.hbs
@@ -1,9 +1,9 @@
 <StyleguideExample @title="category-breadcrumbs">
-  <BreadCrumbs @categories={{dummy.categories}} @showTags={{false}} />
+  <BreadCrumbs @categories={{this.dummy.categories}} @showTags={{false}} />
 </StyleguideExample>
 
-{{#if siteSettings.tagging_enabled}}
+{{#if this.siteSettings.tagging_enabled}}
   <StyleguideExample @title="category-breadcrumbs - tags">
-    <BreadCrumbs @categories={{dummy.categories}} @showTags={{true}} />
+    <BreadCrumbs @categories={{this.dummy.categories}} @showTags={{true}} />
   </StyleguideExample>
 {{/if}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs
index 8dbfe8c071e..01251609699 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/categories.hbs
@@ -1,23 +1,23 @@
 <StyleguideExample @title="category-badge - bullet">
-  {{#each dummy.categories as |c|}}
+  {{#each this.dummy.categories as |c|}}
     {{category-badge c categoryStyle="bullet"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - bar">
-  {{#each dummy.categories as |c|}}
+  {{#each this.dummy.categories as |c|}}
     {{category-badge c categoryStyle="bar"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - box">
-  {{#each dummy.categories as |c|}}
+  {{#each this.dummy.categories as |c|}}
     {{category-badge c categoryStyle="box"}}
   {{/each}}
 </StyleguideExample>
 
 <StyleguideExample @title="category-badge - none">
-  {{#each dummy.categories as |c|}}
+  {{#each this.dummy.categories as |c|}}
     {{category-badge c categoryStyle="none"}}
   {{/each}}
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs
index c9d9a7c95e7..259b290171c 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/empty-state.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="empty-state">
-  <EmptyState @title={{dummy.sentence}} @body={{dummy.short_sentence}} />
+  <EmptyState @title={{this.dummy.sentence}} @body={{this.dummy.short_sentence}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs
index e70fb604522..cb76b1cffe0 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/footer-message.hbs
@@ -1,12 +1,12 @@
 <StyleguideExample @title="footer-message - default">
-  <FooterMessage @education={{dummy.sentence}} @message={{dummy.short_sentence}} />
+  <FooterMessage @education={{this.dummy.sentence}} @message={{this.dummy.short_sentence}} />
 </StyleguideExample>
 
 <StyleguideExample @title="footer-message - latest">
-  <FooterMessage @education={{dummy.sentence}} @message={{dummy.short_sentence}} @latest={{true}} @canCreateTopicOnCategory={{true}} @createTopic={{action "dummy"}} />
+  <FooterMessage @education={{this.dummy.sentence}} @message={{this.dummy.short_sentence}} @latest={{true}} @canCreateTopicOnCategory={{true}} @createTopic={{action "dummy"}} />
 </StyleguideExample>
 
 <StyleguideExample @title="footer-message - top">
-  <FooterMessage @education={{dummy.sentence}} @message={{dummy.short_sentence}} @top={{true}} @changePeriod={{action "dummy"}} />
+  <FooterMessage @education={{this.dummy.sentence}} @message={{this.dummy.short_sentence}} @top={{true}} @changePeriod={{action "dummy"}} />
 </StyleguideExample>
 
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs
index 6a14a566090..38b17c4fe78 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/header-icons.hbs
@@ -3,9 +3,9 @@
 </StyleguideExample>
 
 <StyleguideExample @title="header-icons - user">
-  <MountWidget @widget="header-icons" @args={{hash user=dummy.user}} />
+  <MountWidget @widget="header-icons" @args={{hash user=this.dummy.user}} />
 </StyleguideExample>
 
 <StyleguideExample @title="header-icons - notifications">
-  <MountWidget @widget="header-icons" @args={{hash user=dummy.userWithUnread flagCount=5}} />
+  <MountWidget @widget="header-icons" @args={{hash user=this.dummy.userWithUnread flagCount=5}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
index 6aad7ffdc21..c2cbbdfa3ad 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-bar.hbs
@@ -1,10 +1,10 @@
 <StyleguideExample @title="navigation-bar">
-  <NavigationBar @navItems={{dummy.navItems}} @filterMode="latest" />
+  <NavigationBar @navItems={{this.dummy.navItems}} @filterMode="latest" />
 </StyleguideExample>
 
 <StyleguideExample @title=".user-main .nav-pills">
   <MobileNav @class="main-nav" @desktopClass="nav nav-pills user-nav">
-    {{#each dummy.navItems as |ni|}}
+    {{#each this.dummy.navItems as |ni|}}
       <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
     {{/each}}
   </MobileNav>
@@ -13,10 +13,10 @@
 <StyleguideExample @title="group page navigation-bar">
   <MobileNav @class="group-nav" @desktopClass="nav nav-pills">
     <li class="group-dropdown">
-      <GroupDropdown @groups={{dummy.groupNames}} @value="staff" />
+      <GroupDropdown @groups={{this.dummy.groupNames}} @value="staff" />
     </li>
 
-    {{#each dummy.navItems as |ni|}}
+    {{#each this.dummy.navItems as |ni|}}
       <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
     {{/each}}
   </MobileNav>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
index 2c06daa1d4a..d74029102bc 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/navigation-stacked.hbs
@@ -1,6 +1,6 @@
 <StyleguideExample @title=".nav-stacked" class="half-size">
   <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
-    {{#each dummy.navItems as |ni|}}
+    {{#each this.dummy.navItems as |ni|}}
       <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
     {{/each}}
   </MobileNav>
@@ -9,7 +9,7 @@
 <StyleguideExample @title=".user-navigation .nav-stacked" class="half-size">
   <DSection @class="user-navigation">
     <MobileNav @class="preferences-nav" @desktopClass="preferences-list action-list nav-stacked">
-      {{#each dummy.navItems as |ni|}}
+      {{#each this.dummy.navItems as |ni|}}
         <li><a href={{ni.href}} class={{if ni.styleGuideActive "active"}}>{{ni.displayName}}</a></li>
       {{/each}}
     </MobileNav>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs
index 33de1ec5707..cfa91bedac9 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/post-menu.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="post-menu">
-  <MountWidget @widget="post-menu" @args={{dummy.transformedPost}} />
+  <MountWidget @widget="post-menu" @args={{this.dummy.transformedPost}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs
index cbc435ae793..644f1ab5eaf 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-list-item.hbs
@@ -1,7 +1,7 @@
 <StyleguideExample @title="topic list item">
   <table class="topic-list">
     <tbody>
-      <TopicListItem @topic={{dummy.topic}} @showPosters={{true}} />
+      <TopicListItem @topic={{this.dummy.topic}} @showPosters={{true}} />
     </tbody>
   </table>
 </StyleguideExample>
@@ -9,7 +9,7 @@
 <StyleguideExample @title="topic list item - hide category">
   <table class="topic-list">
     <tbody>
-      <TopicListItem @topic={{dummy.topic}} @hideCategory={{true}} @showPosters={{true}} />
+      <TopicListItem @topic={{this.dummy.topic}} @hideCategory={{true}} @showPosters={{true}} />
     </tbody>
   </table>
 </StyleguideExample>
@@ -17,11 +17,11 @@
 <StyleguideExample @title="topic list item - show likes">
   <table class="topic-list">
     <tbody>
-      <TopicListItem @topic={{dummy.topic}} @showLikes={{true}} @showPosters={{true}} />
+      <TopicListItem @topic={{this.dummy.topic}} @showLikes={{true}} @showPosters={{true}} />
     </tbody>
   </table>
 </StyleguideExample>
 
 <StyleguideExample @title="topic list item - latest" class="half-size">
-  <LatestTopicListItem @topic={{dummy.topic}} />
+  <LatestTopicListItem @topic={{this.dummy.topic}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs
index 938519e8598..aad12d2d028 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-notifications.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="topic-notifications-button">
-  <TopicNotificationsButton @topic={{dummy.topic}} />
+  <TopicNotificationsButton @topic={{this.dummy.topic}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs
index a08ce7837bc..ca901da9e72 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/molecules/topic-timer-info.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="topic-timer-info">
-  <TopicTimerInfo @statusType="reminder" @executeAt={{dummy.soon}} />
+  <TopicTimerInfo @statusType="reminder" @executeAt={{this.dummy.soon}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs
index 9c9b3ca566f..f77db2e9852 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/00-post.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="post">
-  <MountWidget @widget="post" @args={{dummy.transformedPost}} />
+  <MountWidget @widget="post" @args={{this.dummy.transformedPost}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs
index f861132fb17..9492b032ef4 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/01-topic-map.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="topic-map">
-  <MountWidget @widget="topic-map" @args={{dummy.transformedPost}} />
+  <MountWidget @widget="topic-map" @args={{this.dummy.transformedPost}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
index dbb20ba1e36..8265d3306bd 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs
@@ -1,5 +1,5 @@
 <StyleguideExample @title="topic-footer-buttons - logged in">
-  <TopicFooterButtons @topic={{dummy.topic}} />
+  <TopicFooterButtons @topic={{this.dummy.topic}} />
 </StyleguideExample>
 
 <StyleguideExample @title="topic-footer-buttons - anonymous">
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs
index 7f821eda345..c6f3cf8cbcb 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/04-topic-list.hbs
@@ -1,7 +1,7 @@
 <StyleguideExample @title="topic-list">
-  <TopicList @topics={{dummy.topics}} @showPosters={{true}} />
+  <TopicList @topics={{this.dummy.topics}} @showPosters={{true}} />
 </StyleguideExample>
 
 <StyleguideExample @title="topic-list - hide posters">
-  <TopicList @topics={{dummy.topics}} @showPosters={{false}} />
+  <TopicList @topics={{this.dummy.topics}} @showPosters={{false}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
index 7f946963b2e..b727dbb900a 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="basic-topic-list" class="half-size">
-  <BasicTopicList @topics={{dummy.topics}} />
+  <BasicTopicList @topics={{this.dummy.topics}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs
index 2c1bb0ee9c6..df6596b596a 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/categories-list.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="categories-only">
-  <CategoriesOnly @categories={{dummy.categories}} />
+  <CategoriesOnly @categories={{this.dummy.categories}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs
index f02c80e1d3d..1752ef957fa 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/modal.hbs
@@ -1,7 +1,7 @@
 <StyleguideExample @title="d-modal">
   <DModal @closeModal={{action "dummy"}} @modalStyle="inline-modal" @title={{i18n "styleguide.sections.modal.header"}}>
     <DModalBody>
-      {{html-safe dummy.lorem}}
+      {{html-safe this.dummy.lorem}}
     </DModalBody>
     <div class="modal-footer">
       {{i18n "styleguide.sections.modal.footer"}}
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs
index 6de62ca201f..64f38c432f8 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/navigation.hbs
@@ -2,8 +2,8 @@
   <div class="list-controls">
     <div class="container">
       <DSection @class="navigation-container">
-        <BreadCrumbs @categories={{dummy.categories}} />
-        <NavigationBar @navItems={{dummy.navItems}} @filterMode="latest" />
+        <BreadCrumbs @categories={{this.dummy.categories}} />
+        <NavigationBar @navItems={{this.dummy.navItems}} @filterMode="latest" />
         <div class="navigation-controls">
           <CategoriesAdminDropdown />
           <CreateTopicButton @canCreateTopic={{true}} />
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
index 9092a6c46b4..587379a92ce 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/site-header.hbs
@@ -4,9 +4,9 @@
       <div class="wrap">
         <div class="contents">
           <MountWidget @widget="home-logo" @args={{hash minimized=true}} />
-          <MountWidget @widget="header-topic-info" @args={{dummy}} />
+          <MountWidget @widget="header-topic-info" @args={{this.dummy}} />
           <div class="panel clearfix">
-            <MountWidget @widget="header-icons" @args={{hash user=dummy.user}} />
+            <MountWidget @widget="header-icons" @args={{hash user=this.dummy.user}} />
           </div>
         </div>
       </div>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs
index dab9e542d85..8a2a7b62a4f 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/suggested-topics.hbs
@@ -1,3 +1,3 @@
 <StyleguideExample @title="suggested-topics">
-  <SuggestedTopics @topic={{dummy.topic}} />
+  <SuggestedTopics @topic={{this.dummy.topic}} />
 </StyleguideExample>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
index 1cf6c88ec36..2967778664a 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/user-about.hbs
@@ -4,7 +4,7 @@
       <div class="profile-image"></div>
       <div class="details">
         <div class="primary">
-          {{bound-avatar dummy.user "huge"}}
+          {{bound-avatar this.dummy.user "huge"}}
           <section class="controls">
             <ul>
               <li>
@@ -13,15 +13,15 @@
                   {{i18n "user.private_message"}}
                 </a>
               </li>
-              <li><a href={{dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
+              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
               <li><a href="#" class="btn">{{d-icon "angle-double-down"}}{{i18n "user.expand_profile"}}</a></li>
             </ul>
           </section>
 
           <div class="primary-textual">
-            <h1 class="username">{{dummy.user.username}} {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{dummy.user.name}}</h2>
-            <h3>{{dummy.user.title}}</h3>
+            <h1 class="username">{{this.dummy.user.username}} {{d-icon "shield-alt"}}</h1>
+            <h2 class="full-name">{{this.dummy.user.name}}</h2>
+            <h3>{{this.dummy.user.title}}</h3>
           </div>
         </div>
         <div style="clear: both"></div>
@@ -32,11 +32,11 @@
 
 <StyleguideExample @title=".user-main .about.collapsed-info.has-background">
   <DSection @class="user-main">
-    <section class="collapsed-info about has-background"  style={{dummy.user.profileBackground}}>
+    <section class="collapsed-info about has-background"  style={{this.dummy.user.profileBackground}}>
       <div class="profile-image"></div>
       <div class="details">
         <div class="primary">
-          {{bound-avatar dummy.user "huge"}}
+          {{bound-avatar this.dummy.user "huge"}}
           <section class="controls">
             <ul>
               <li>
@@ -45,15 +45,15 @@
                   {{i18n "user.private_message"}}
                 </a>
               </li>
-              <li><a href={{dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
+              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
               <li><a href="#" class="btn">{{d-icon "angle-double-down"}}{{i18n "user.expand_profile"}}</a></li>
             </ul>
           </section>
 
           <div class="primary-textual">
-            <h1 class="username">{{dummy.user.username}} {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{dummy.user.name}}</h2>
-            <h3>{{dummy.user.title}}</h3>
+            <h1 class="username">{{this.dummy.user.username}} {{d-icon "shield-alt"}}</h1>
+            <h2 class="full-name">{{this.dummy.user.name}}</h2>
+            <h3>{{this.dummy.user.title}}</h3>
           </div>
         </div>
         <div style="clear: both"></div>
@@ -67,25 +67,25 @@
     <section class="about no-background">
 
       <div class="staff-counters">
-        <div><span class="helpful-flags">{{dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n "user.staff_counters.flags_given"}}</div>
+        <div><span class="helpful-flags">{{this.dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n "user.staff_counters.flags_given"}}</div>
         <div>
           <a href="#">
-            <span class="flagged-posts">{{dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
+            <span class="flagged-posts">{{this.dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
           </a>
         </div>
         <div>
           <a href="#">
-            <span class="deleted-posts">{{dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
+            <span class="deleted-posts">{{this.dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
           </a>
         </div>
-        <div><span class="suspensions">{{dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n "user.staff_counters.suspensions"}}</div>
-        <div><span class="warnings-received">{{dummy.user.warnings_received_count}}</span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}</div>
+        <div><span class="suspensions">{{this.dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n "user.staff_counters.suspensions"}}</div>
+        <div><span class="warnings-received">{{this.dummy.user.warnings_received_count}}</span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}</div>
       </div>
 
       <div class="profile-image"></div>
       <div class="details">
         <div class="primary">
-          {{bound-avatar dummy.user "huge"}}
+          {{bound-avatar this.dummy.user "huge"}}
           <section class="controls">
             <ul>
               <li>
@@ -94,31 +94,31 @@
                   {{i18n "user.private_message"}}
                 </a>
               </li>
-              <li><a href={{dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
+              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
             </ul>
           </section>
 
           <div class="primary-textual">
-            <h1 class="username">{{dummy.user.username}} {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{dummy.user.name}}</h2>
-            <h3>{{dummy.user.title}}</h3>
+            <h1 class="username">{{this.dummy.user.username}} {{d-icon "shield-alt"}}</h1>
+            <h2 class="full-name">{{this.dummy.user.name}}</h2>
+            <h3>{{this.dummy.user.title}}</h3>
             <h3>
-              {{d-icon "map-marker-alt"}} {{dummy.user.location}}
+              {{d-icon "map-marker-alt"}} {{this.dummy.user.location}}
               {{d-icon "globe"}}
-              <a href={{dummy.user.website}} rel="nofollow noopener noreferrer" target="_blank">{{dummy.user.website_name}}</a>
+              <a href={{this.dummy.user.website}} rel="nofollow noopener noreferrer" target="_blank">{{this.dummy.user.website_name}}</a>
             </h3>
 
             <div class="bio">
               <div class="suspended">
                 {{d-icon "ban"}}
-                <b>{{i18n "user.suspended_notice" date=dummy.user.suspendedTillDate}}</b><br>
-                <b>{{i18n "user.suspended_reason"}}</b> {{dummy.user.suspend_reason}}
+                <b>{{i18n "user.suspended_notice" date=this.dummy.user.suspendedTillDate}}</b><br>
+                <b>{{i18n "user.suspended_reason"}}</b> {{this.dummy.user.suspend_reason}}
               </div>
-              {{html-safe dummy.user.bio_cooked}}
+              {{html-safe this.dummy.user.bio_cooked}}
             </div>
 
             <div class="public-user-fields">
-              {{#each dummy.user.publicUserFields as |uf|}}
+              {{#each this.dummy.user.publicUserFields as |uf|}}
                 {{#if uf.value}}
                   <div class="public-user-field {{uf.field.dasherized_name}}">
                     <span class="user-field-name">{{uf.field.name}}</span>:
@@ -134,19 +134,19 @@
 
       <div class="secondary">
         <dl>
-          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date dummy.user.created_at}}</dd>
-          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date dummy.user.last_posted_at}}</dd>
-          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date dummy.user.last_seen_at}}</dd>
-          <dt>{{i18n "views"}}</dt><dd>{{dummy.user.profile_view_count}}</dd>
-          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd class="invited-by"><a href="#">{{dummy.user.invited_by.username}}</a></dd>
-          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{dummy.user.trustLevel.name}}</dd>
+          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date this.dummy.user.created_at}}</dd>
+          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date this.dummy.user.last_posted_at}}</dd>
+          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date this.dummy.user.last_seen_at}}</dd>
+          <dt>{{i18n "views"}}</dt><dd>{{this.dummy.user.profile_view_count}}</dd>
+          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd class="invited-by"><a href="#">{{this.dummy.user.invited_by.username}}</a></dd>
+          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
           <dt>{{i18n "user.email.title"}}</dt>
-          <dd title={{dummy.user.email}}>
+          <dd title={{this.dummy.user.email}}>
             <DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
           </dd>
-          <dt class="groups">{{i18n "groups.title" count=dummy.user.displayGroups.length}}</dt>
+          <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
           <dd class="groups">
-            {{#each dummy.user.displayGroups as |group|}}
+            {{#each this.dummy.user.displayGroups as |group|}}
               <span><a href="#" class="group-link">{{group.name}}</a></span>
             {{/each}}
           </dd>
@@ -159,27 +159,27 @@
 
 <StyleguideExample @title=".user-main .about.has-background">
   <DSection @class="user-main">
-    <section class="about has-background"  style={{dummy.user.profileBackground}}>
+    <section class="about has-background"  style={{this.dummy.user.profileBackground}}>
       <div class="staff-counters">
-        <div><span class="helpful-flags">{{dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n "user.staff_counters.flags_given"}}</div>
+        <div><span class="helpful-flags">{{this.dummy.user.number_of_flags_given}}</span>&nbsp;{{i18n "user.staff_counters.flags_given"}}</div>
         <div>
           <a href="#">
-            <span class="flagged-posts">{{dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
+            <span class="flagged-posts">{{this.dummy.user.number_of_flagged_posts}}</span>&nbsp;{{i18n "user.staff_counters.flagged_posts"}}
           </a>
         </div>
         <div>
           <a href="#">
-            <span class="deleted-posts">{{dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
+            <span class="deleted-posts">{{this.dummy.user.number_of_deleted_posts}}</span>&nbsp;{{i18n "user.staff_counters.deleted_posts"}}
           </a>
         </div>
-        <div><span class="suspensions">{{dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n "user.staff_counters.suspensions"}}</div>
-        <div><span class="warnings-received">{{dummy.user.warnings_received_count}}</span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}</div>
+        <div><span class="suspensions">{{this.dummy.user.number_of_suspensions}}</span>&nbsp;{{i18n "user.staff_counters.suspensions"}}</div>
+        <div><span class="warnings-received">{{this.dummy.user.warnings_received_count}}</span>&nbsp;{{i18n "user.staff_counters.warnings_received"}}</div>
       </div>
 
       <div class="profile-image"></div>
       <div class="details">
         <div class="primary">
-          {{bound-avatar dummy.user "huge"}}
+          {{bound-avatar this.dummy.user "huge"}}
           <section class="controls">
             <ul>
               <li>
@@ -188,31 +188,31 @@
                   {{i18n "user.private_message"}}
                 </a>
               </li>
-              <li><a href={{dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
+              <li><a href={{this.dummy.user.adminPath}} class="btn">{{d-icon "wrench"}}{{i18n "admin.user.show_admin_profile"}}</a></li>
             </ul>
           </section>
 
           <div class="primary-textual">
-            <h1 class="username">{{dummy.user.username}} {{d-icon "shield-alt"}}</h1>
-            <h2 class="full-name">{{dummy.user.name}}</h2>
-            <h3>{{dummy.user.title}}</h3>
+            <h1 class="username">{{this.dummy.user.username}} {{d-icon "shield-alt"}}</h1>
+            <h2 class="full-name">{{this.dummy.user.name}}</h2>
+            <h3>{{this.dummy.user.title}}</h3>
             <h3>
-              {{d-icon "map-marker-alt"}} {{dummy.user.location}}
+              {{d-icon "map-marker-alt"}} {{this.dummy.user.location}}
               {{d-icon "globe"}}
-              <a href={{dummy.user.website}} rel="nofollow noopener noreferrer" target="_blank">{{dummy.user.website_name}}</a>
+              <a href={{this.dummy.user.website}} rel="nofollow noopener noreferrer" target="_blank">{{this.dummy.user.website_name}}</a>
             </h3>
 
             <div class="bio">
               <div class="suspended">
                 {{d-icon "ban"}}
-                <b>{{i18n "user.suspended_notice" date=dummy.user.suspendedTillDate}}</b><br>
-                <b>{{i18n "user.suspended_reason"}}</b> {{dummy.user.suspend_reason}}
+                <b>{{i18n "user.suspended_notice" date=this.dummy.user.suspendedTillDate}}</b><br>
+                <b>{{i18n "user.suspended_reason"}}</b> {{this.dummy.user.suspend_reason}}
               </div>
-              {{html-safe dummy.user.bio_cooked}}
+              {{html-safe this.dummy.user.bio_cooked}}
             </div>
 
             <div class="public-user-fields">
-              {{#each dummy.user.publicUserFields as |uf|}}
+              {{#each this.dummy.user.publicUserFields as |uf|}}
                 {{#if uf.value}}
                   <div class="public-user-field {{uf.field.dasherized_name}}">
                     <span class="user-field-name">{{uf.field.name}}</span>:
@@ -229,19 +229,19 @@
 
       <div class="secondary">
         <dl>
-          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date dummy.user.created_at}}</dd>
-          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date dummy.user.last_posted_at}}</dd>
-          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date dummy.user.last_seen_at}}</dd>
-          <dt>{{i18n "views"}}</dt><dd>{{dummy.user.profile_view_count}}</dd>
-          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd class="invited-by"><a href="#">{{dummy.user.invited_by.username}}</a></dd>
-          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{dummy.user.trustLevel.name}}</dd>
+          <dt>{{i18n "user.created"}}</dt><dd>{{bound-date this.dummy.user.created_at}}</dd>
+          <dt>{{i18n "user.last_posted"}}</dt><dd>{{bound-date this.dummy.user.last_posted_at}}</dd>
+          <dt>{{i18n "user.last_seen"}}</dt><dd>{{bound-date this.dummy.user.last_seen_at}}</dd>
+          <dt>{{i18n "views"}}</dt><dd>{{this.dummy.user.profile_view_count}}</dd>
+          <dt class="invited-by">{{i18n "user.invited_by"}}</dt><dd class="invited-by"><a href="#">{{this.dummy.user.invited_by.username}}</a></dd>
+          <dt class="trust-level">{{i18n "user.trust_level"}}</dt><dd class="trust-level">{{this.dummy.user.trustLevel.name}}</dd>
           <dt>{{i18n "user.email.title"}}</dt>
-          <dd title={{dummy.user.email}}>
+          <dd title={{this.dummy.user.email}}>
             <DButton @icon="far-envelope" @label="admin.users.check_email.text" @class="btn-primary" />
           </dd>
-          <dt class="groups">{{i18n "groups.title" count=dummy.user.displayGroups.length}}</dt>
+          <dt class="groups">{{i18n "groups.title" count=this.dummy.user.displayGroups.length}}</dt>
           <dd class="groups">
-            {{#each dummy.user.displayGroups as |group|}}
+            {{#each this.dummy.user.displayGroups as |group|}}
               <span><a href="#" class="group-link">{{group.name}}</a></span>
             {{/each}}
           </dd>
diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
index 68185e37ce0..94a3748416e 100644
--- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
+++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/show.hbs
@@ -1,7 +1,7 @@
-<StyleguideSection @section={{section}}>
-  {{#if note}}
+<StyleguideSection @section={{this.section}}>
+  {{#if this.note}}
     <div class="styleguide-note">
-      {{component (concat "notes/" note)}}
+      {{component (concat "notes/" this.note)}}
     </div>
   {{/if}}