diff --git a/.template-lintrc.js b/.template-lintrc.js
index 1d984309976..3c356744210 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -9,6 +9,5 @@ module.exports = {
     'require-valid-alt-text': false,
     'no-action': false,
     'no-curly-component-invocation': false,
-    'no-implicit-this': false,
   },
 };
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 85fd02c80f8..ff67276504a 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -16,16 +16,21 @@
   </LinkTo>
 
   <form class='search' action='/search' {{ action "search" on="submit" }} data-test-search-form>
-    <input type="text" class="search" name="q" id="cargo-desktop-search"
-            placeholder="Click or press 'S' to search..."
-            value={{searchQuery}}
-            oninput={{action (mut searchQuery) value="target.value"}}
-            autocorrect="off"
-            autocapitalize="off"
-            autofocus="autofocus"
-            spellcheck="false"
-            required
-            data-test-search-input>
+    <input
+      type="text"
+      class="search"
+      name="q"
+      id="cargo-desktop-search"
+      placeholder="Click or press 'S' to search..."
+      value={{this.searchQuery}}
+      oninput={{action (mut this.searchQuery) value="target.value"}}
+      autocorrect="off"
+      autocapitalize="off"
+      autofocus="autofocus"
+      spellcheck="false"
+      required
+      data-test-search-input
+    >
     <label for="cargo-desktop-search">Search</label>
   </form>
 
@@ -58,11 +63,11 @@
       </RlDropdown>
     </RlDropdownContainer>
     <span class="sep">|</span>
-    {{#if session.currentUser}}
+    {{#if this.session.currentUser}}
       <RlDropdownContainer class="dropdown-container">
         <RlDropdownToggle class="dropdown">
-          <UserAvatar @user={{session.currentUser}} @size="small" />
-          {{ session.currentUser.name }}
+          <UserAvatar @user={{this.session.currentUser}} @size="small" />
+          {{ this.session.currentUser.name }}
           <span class='arrow'></span>
         </RlDropdownToggle>
 
@@ -89,7 +94,7 @@
       </RlDropdownToggle>
       <RlDropdown @tagName="ul" class="dropdown current-user-links">
         <li><LinkTo @route="crates">Browse All Crates</LinkTo></li>
-        {{#if session.currentUser}}
+        {{#if this.session.currentUser}}
           <li><LinkTo @route="dashboard">Dashboard</LinkTo></li>
           <li><LinkTo @route="me">Account Settings</LinkTo></li>
           <li><LinkTo @route="me.pending-invites">Owner Invites</LinkTo></li>
@@ -106,12 +111,17 @@
 </nav>
 
 <form id='mobile-search' class='search' action='/search' {{ action "search" on="submit" }} >
-  <input type="text" class="search" name="q" id="cargo-mobile-search"
-          placeholder="Search"
-          value={{searchQuery}}
-          oninput={{action (mut searchQuery) value="target.value"}}
-          autocorrect="off"
-          required>
+  <input
+    type="text"
+    class="search"
+    name="q"
+    id="cargo-mobile-search"
+    placeholder="Search"
+    value={{this.searchQuery}}
+    oninput={{action (mut this.searchQuery) value="target.value"}}
+    autocorrect="off"
+    required
+  >
   <label for="cargo-mobile-search">Search</label>
 </form>
 
diff --git a/app/templates/catch-all.hbs b/app/templates/catch-all.hbs
index 277a59b51a4..d12c0c162ec 100644
--- a/app/templates/catch-all.hbs
+++ b/app/templates/catch-all.hbs
@@ -7,7 +7,7 @@
     @type="text"
     class="search"
     placeholder="Search"
-    @value={{search}}
+    @value={{this.search}}
     @enter={{action "search"}}
     required={{true}}
   />
diff --git a/app/templates/categories.hbs b/app/templates/categories.hbs
index e89957e8722..f8c95b9742f 100644
--- a/app/templates/categories.hbs
+++ b/app/templates/categories.hbs
@@ -9,8 +9,8 @@
   <div class='nav' data-test-categories-nav>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -19,7 +19,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -40,7 +40,7 @@
 </div>
 
 <div class='white-rows'>
-  {{#each model as |category|}}
+  {{#each this.model as |category|}}
     <div class='row' data-test-category={{category.slug}}>
       <div class='desc'>
         <div class='info'>
@@ -60,13 +60,13 @@
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/category-slugs.hbs b/app/templates/category-slugs.hbs
index 5adf0881bae..297fcb8e7f5 100644
--- a/app/templates/category-slugs.hbs
+++ b/app/templates/category-slugs.hbs
@@ -8,7 +8,7 @@
 
   <div class='white-rows'>
     <dl>
-      {{#each model as |category|}}
+      {{#each this.model as |category|}}
         <dt data-test-category-slug={{category.slug}}>{{category.slug}}</dt>
         <dd data-test-category-description={{category.slug}}>{{category.description}}</dd>
       {{/each}}
diff --git a/app/templates/category/index.hbs b/app/templates/category/index.hbs
index f47c50b15cd..137718ba48e 100644
--- a/app/templates/category/index.hbs
+++ b/app/templates/category/index.hbs
@@ -1,22 +1,22 @@
-{{ title category.category ' - Categories' }}
+{{ title this.category.category ' - Categories' }}
 
 <div id='crates-heading'>
   <LinkTo @route="categories" aria-label="Categories">{{svg-jar "crate"}}</LinkTo>
   <h1>
-    {{#each category.parent_categories as |parent|}}<LinkTo @route="category" @model={{parent.slug}}>{{parent.category}}</LinkTo>::{{/each}}
-    {{~ category.category }}
+    {{#each this.category.parent_categories as |parent|}}<LinkTo @route="category" @model={{parent.slug}}>{{parent.category}}</LinkTo>::{{/each}}
+    {{~ this.category.category }}
   </h1>
 </div>
 
 <div>
-  <p>{{ category.description }}</p>
+  <p>{{ this.category.description }}</p>
 </div>
 
-{{#if category.subcategories }}
+{{#if this.category.subcategories }}
   <div id='subcategories'>
     <h2>Subcategories</h2>
     <div class='white-rows'>
-      {{#each category.subcategories as |subcategory| }}
+      {{#each this.category.subcategories as |subcategory| }}
         <div class='row'>
           <div class='desc'>
             <div class='info'>
@@ -42,8 +42,8 @@
   <div class='nav' data-test-category-nav>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -52,7 +52,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -83,19 +83,19 @@
 </div>
 
 <div id='crates' class='white-rows'>
-  {{#each model as |crate|}}
+  {{#each this.model as |crate|}}
     <CrateRow @crate={{crate}} />
   {{/each}}
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/components/api-token-row.hbs b/app/templates/components/api-token-row.hbs
index 0c7f905afe7..58db299cdca 100644
--- a/app/templates/components/api-token-row.hbs
+++ b/app/templates/components/api-token-row.hbs
@@ -1,32 +1,33 @@
-<div class={{if api_token.isNew "row create-token" "row"}}>
+<div class={{if this.api_token.isNew "row create-token" "row"}}>
   <div class='name'>
-    {{#if api_token.isNew}}
+    {{#if this.api_token.isNew}}
       <Input
-        @type="text" placeholder="New token name"
-        @disabled={{api_token.isSaving}}
-        @value={{api_token.name}}
+        @type="text"
+        placeholder="New token name"
+        @disabled={{this.api_token.isSaving}}
+        @value={{this.api_token.name}}
         @autofocus="autofocus"
         @enter="saveToken"
         data-test-focused-input
       />
     {{else}}
-      {{ api_token.name }}
+      {{ this.api_token.name }}
     {{/if}}
   </div>
 
   <div class='spacer'></div>
 
-  {{#unless api_token.isNew}}
+  {{#unless this.api_token.isNew}}
     <div class='dates'>
       <div class='created-at'>
-        <span class='small' title={{api_token.created_at}}>
-          Created {{moment-from-now api_token.created_at}}
+        <span class='small' title={{this.api_token.created_at}}>
+          Created {{moment-from-now this.api_token.created_at}}
         </span>
       </div>
-      {{#if api_token.last_used_at}}
+      {{#if this.api_token.last_used_at}}
         <div class='last_used_at'>
-          <span class='small' title={{api_token.last_used_at}}>
-            Last used {{moment-from-now api_token.last_used_at}}
+          <span class='small' title={{this.api_token.last_used_at}}>
+            Last used {{moment-from-now this.api_token.last_used_at}}
           </span>
         </div>
       {{else}}
@@ -38,12 +39,12 @@
   {{/unless}}
 
   <div class='actions'>
-    {{#if api_token.isNew}}
+    {{#if this.api_token.isNew}}
       <button
         type="button"
         class='small yellow-button'
-        disabled={{disableCreate}}
-        title={{if emptyName "You must specify a name" ""}}
+        disabled={{this.disableCreate}}
+        title={{if this.emptyName "You must specify a name" ""}}
         {{action "saveToken"}}
       >
         Create
@@ -52,34 +53,34 @@
       <button
         type="button"
         class='small tan-button'
-        disabled={{api_token.isSaving}}
+        disabled={{this.api_token.isSaving}}
         {{action "revokeToken"}}
       >
         Revoke
       </button>
     {{/if}}
-    {{#if api_token.isSaving}}
+    {{#if this.api_token.isSaving}}
       <img class='overlay' src="/assets/ajax-loader.gif">
     {{/if}}
   </div>
 </div>
 
-{{#if serverError}}
+{{#if this.serverError}}
   <div class='row error'>
     <div>
-      {{ serverError }}
+      {{ this.serverError }}
     </div>
   </div>
 {{/if}}
 
-{{#if api_token.token}}
+{{#if this.api_token.token}}
   <div class='row new-token'>
     <div>
       Please record this token somewhere, you cannot retrieve
       its value again. For use on the command line you can save it to <code>~/.cargo/credentials</code>
       with:
 
-      <pre>cargo login {{ api_token.token }}</pre>
+      <pre>cargo login {{ this.api_token.token }}</pre>
     </div>
   </div>
 {{/if}}
diff --git a/app/templates/components/badge-appveyor.hbs b/app/templates/components/badge-appveyor.hbs
index 7c6cc34c8a2..d2248383ae0 100644
--- a/app/templates/components/badge-appveyor.hbs
+++ b/app/templates/components/badge-appveyor.hbs
@@ -1,8 +1,8 @@
-<a href="https://ci.appveyor.com/project/{{ projectName }}">
+<a href="https://ci.appveyor.com/project/{{ this.projectName }}">
   <img
-      src="{{ imageUrl }}"
-      alt="{{ text }}"
+      src="{{ this.imageUrl }}"
+      alt="{{ this.text }}"
       width="106"
       height="20"
-      title="{{ text }}">
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-azure-devops.hbs b/app/templates/components/badge-azure-devops.hbs
index b58e9721f46..e291bd739ca 100644
--- a/app/templates/components/badge-azure-devops.hbs
+++ b/app/templates/components/badge-azure-devops.hbs
@@ -1,3 +1,3 @@
-<a href="https://dev.azure.com/{{ project }}/_build/latest?definitionId={{ build }}">
-  <img src="https://dev.azure.com/{{ project }}/_apis/build/status/{{ pipeline }}" alt="{{ text }}" title="{{ text }}">
+<a href="https://dev.azure.com/{{ this.project }}/_build/latest?definitionId={{ this.build }}">
+  <img src="https://dev.azure.com/{{ this.project }}/_apis/build/status/{{ this.pipeline }}" alt="{{ this.text }}" title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-bitbucket-pipelines.hbs b/app/templates/components/badge-bitbucket-pipelines.hbs
index 5c1abebe40f..9a0d9b0ea8e 100644
--- a/app/templates/components/badge-bitbucket-pipelines.hbs
+++ b/app/templates/components/badge-bitbucket-pipelines.hbs
@@ -1,6 +1,6 @@
-<a href="https://bitbucket.org/{{ repository }}/addon/pipelines/home#!/results/branch/{{ branch }}/page/1">
+<a href="https://bitbucket.org/{{ this.repository }}/addon/pipelines/home#!/results/branch/{{ this.branch }}/page/1">
   <img
-      src="https://img.shields.io/bitbucket/pipelines/{{ repository }}/{{ branch }}"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://img.shields.io/bitbucket/pipelines/{{ this.repository }}/{{ this.branch }}"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-circle-ci.hbs b/app/templates/components/badge-circle-ci.hbs
index c26dc67f844..8d04b7a8d69 100644
--- a/app/templates/components/badge-circle-ci.hbs
+++ b/app/templates/components/badge-circle-ci.hbs
@@ -1,6 +1,6 @@
-<a href="https://circleci.com/gh/{{ repository }}">
+<a href="https://circleci.com/gh/{{ this.repository }}">
   <img
-      src="https://circleci.com/gh/{{ repository }}/tree/{{ branch }}.svg?style=shield"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://circleci.com/gh/{{ this.repository }}/tree/{{ this.branch }}.svg?style=shield"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-cirrus-ci.hbs b/app/templates/components/badge-cirrus-ci.hbs
index 33afc52d760..c9ce44f1b22 100644
--- a/app/templates/components/badge-cirrus-ci.hbs
+++ b/app/templates/components/badge-cirrus-ci.hbs
@@ -1,6 +1,6 @@
-<a href="https://cirrus-ci.com/github/{{ repository }}">
+<a href="https://cirrus-ci.com/github/{{ this.repository }}">
   <img
-      src="https://api.cirrus-ci.com/github/{{ repository }}.svg?branch={{ branch }}"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://api.cirrus-ci.com/github/{{ this.repository }}.svg?branch={{ this.branch }}"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-codecov.hbs b/app/templates/components/badge-codecov.hbs
index b411913e4a5..a1f42125582 100644
--- a/app/templates/components/badge-codecov.hbs
+++ b/app/templates/components/badge-codecov.hbs
@@ -1,6 +1,6 @@
-<a href="https://codecov.io/{{ service }}/{{ repository }}?branch={{ branch }}">
+<a href="https://codecov.io/{{ this.service }}/{{ this.repository }}?branch={{ this.branch }}">
   <img
-      src="https://codecov.io/{{ service }}/{{ repository }}/coverage.svg?branch={{ branch }}"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://codecov.io/{{ this.service }}/{{ this.repository }}/coverage.svg?branch={{ this.branch }}"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-coveralls.hbs b/app/templates/components/badge-coveralls.hbs
index 3beeeaeae84..36cb421bc32 100644
--- a/app/templates/components/badge-coveralls.hbs
+++ b/app/templates/components/badge-coveralls.hbs
@@ -1,6 +1,6 @@
-<a href="https://coveralls.io/{{ service }}/{{ repository }}?branch={{ branch }}">
+<a href="https://coveralls.io/{{ this.service }}/{{ this.repository }}?branch={{ this.branch }}">
   <img
-      src="https://coveralls.io/repos/{{ service }}/{{ repository }}/badge.svg?branch={{ branch }}"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://coveralls.io/repos/{{ this.service }}/{{ this.repository }}/badge.svg?branch={{ this.branch }}"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-gitlab.hbs b/app/templates/components/badge-gitlab.hbs
index e24b1cecafc..b9e1b4bb88b 100644
--- a/app/templates/components/badge-gitlab.hbs
+++ b/app/templates/components/badge-gitlab.hbs
@@ -1,6 +1,6 @@
-<a href="https://gitlab.com/{{ repository }}/pipelines">
+<a href="https://gitlab.com/{{ this.repository }}/pipelines">
   <img
-      src="https://gitlab.com/{{ repository }}/badges/{{ branch }}/pipeline.svg"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://gitlab.com/{{ this.repository }}/badges/{{ this.branch }}/pipeline.svg"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-is-it-maintained-issue-resolution.hbs b/app/templates/components/badge-is-it-maintained-issue-resolution.hbs
index 604b2d128df..0e294482e8d 100644
--- a/app/templates/components/badge-is-it-maintained-issue-resolution.hbs
+++ b/app/templates/components/badge-is-it-maintained-issue-resolution.hbs
@@ -1,6 +1,6 @@
-<a href="https://isitmaintained.com/project/{{ repository }}">
+<a href="https://isitmaintained.com/project/{{ this.repository }}">
   <img
-      src="https://isitmaintained.com/badge/resolution/{{ repository }}.svg"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://isitmaintained.com/badge/resolution/{{ this.repository }}.svg"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-is-it-maintained-open-issues.hbs b/app/templates/components/badge-is-it-maintained-open-issues.hbs
index 7034e257d96..d2c4533a75b 100644
--- a/app/templates/components/badge-is-it-maintained-open-issues.hbs
+++ b/app/templates/components/badge-is-it-maintained-open-issues.hbs
@@ -1,6 +1,6 @@
-<a href="https://isitmaintained.com/project/{{ repository }}">
+<a href="https://isitmaintained.com/project/{{ this.repository }}">
   <img
-      src="https://isitmaintained.com/badge/open/{{ repository }}.svg"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://isitmaintained.com/badge/open/{{ this.repository }}.svg"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/badge-maintenance.hbs b/app/templates/components/badge-maintenance.hbs
index c1fe446056e..f959fd3548c 100644
--- a/app/templates/components/badge-maintenance.hbs
+++ b/app/templates/components/badge-maintenance.hbs
@@ -1,6 +1,6 @@
-{{#unless none}}
+{{#unless this.none}}
   <img
-      src="https://img.shields.io/badge/maintenance-{{escapedStatus}}-{{color}}.svg"
-      alt="{{text}}"
-      title="{{text}}">
+      src="https://img.shields.io/badge/maintenance-{{this.escapedStatus}}-{{this.color}}.svg"
+      alt="{{this.text}}"
+      title="{{this.text}}">
 {{/unless}}
diff --git a/app/templates/components/badge-travis-ci.hbs b/app/templates/components/badge-travis-ci.hbs
index c61c2e6d64d..61f099026bf 100644
--- a/app/templates/components/badge-travis-ci.hbs
+++ b/app/templates/components/badge-travis-ci.hbs
@@ -1,6 +1,6 @@
-<a href="https://travis-ci.org/{{ repository }}">
+<a href="https://travis-ci.org/{{ this.repository }}">
   <img
-      src="https://travis-ci.org/{{ repository }}.svg?branch={{ branch }}"
-      alt="{{ text }}"
-      title="{{ text }}">
+      src="https://travis-ci.org/{{ this.repository }}.svg?branch={{ this.branch }}"
+      alt="{{ this.text }}"
+      title="{{ this.text }}">
 </a>
diff --git a/app/templates/components/category-list.hbs b/app/templates/components/category-list.hbs
index 985ab43c528..aaacf8aec3c 100644
--- a/app/templates/components/category-list.hbs
+++ b/app/templates/components/category-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each categories as |category|}}
+  {{#each this.categories as |category|}}
     <li>
       <LinkTo @route="category" @model={{category.slug}} class="name">
         <span>{{ category.category }} ({{ format-num category.crates_cnt }})</span>
diff --git a/app/templates/components/crate-badge.hbs b/app/templates/components/crate-badge.hbs
index 0f330cb527a..d4288727fde 100644
--- a/app/templates/components/crate-badge.hbs
+++ b/app/templates/components/crate-badge.hbs
@@ -1,5 +1,5 @@
 <img
-    src="https://img.shields.io/badge/crates.io-v{{ version }}-{{ color }}.svg?longCache=true"
-    alt="{{ crate.max_version }}"
-    title="{{ crate.name }}’s current version badge"
+    src="https://img.shields.io/badge/crates.io-v{{ this.version }}-{{ this.color }}.svg?longCache=true"
+    alt="{{ this.crate.max_version }}"
+    title="{{ this.crate.name }}’s current version badge"
     data-test-version-badge>
diff --git a/app/templates/components/crate-downloads-list.hbs b/app/templates/components/crate-downloads-list.hbs
index 00c6027b1c9..6bd66d063d0 100644
--- a/app/templates/components/crate-downloads-list.hbs
+++ b/app/templates/components/crate-downloads-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each crates as |crate|}}
+  {{#each this.crates as |crate|}}
     <li>
       <LinkTo @route="crate" @model={{crate.id}} class="name">
         {{ crate.name }} ({{ crate.max_version }})
diff --git a/app/templates/components/crate-list.hbs b/app/templates/components/crate-list.hbs
index 471ad905ee1..f4c69d02739 100644
--- a/app/templates/components/crate-list.hbs
+++ b/app/templates/components/crate-list.hbs
@@ -1,5 +1,5 @@
 <ol>
-  {{#each crates as |crate index|}}
+  {{#each this.crates as |crate index|}}
     <li>
       <LinkTo @route="crate" @model={{crate.id}} class="name" data-test-crate-link={{index}}>
         <span>{{ crate.name }} ({{ crate.max_version }})</span>
diff --git a/app/templates/components/crate-readme.hbs b/app/templates/components/crate-readme.hbs
index 24b77319bfe..0308050c294 100644
--- a/app/templates/components/crate-readme.hbs
+++ b/app/templates/components/crate-readme.hbs
@@ -1 +1 @@
-{{html-safe rendered}}
+{{html-safe this.rendered}}
diff --git a/app/templates/components/crate-row.hbs b/app/templates/components/crate-row.hbs
index a3dbc2bb232..df146bec53b 100644
--- a/app/templates/components/crate-row.hbs
+++ b/app/templates/components/crate-row.hbs
@@ -1,44 +1,44 @@
 <div class='desc'>
   <div class='info'>
-    <LinkTo @route="crate" @model={{crate.id}} data-test-crate-link>{{ crate.name }}</LinkTo>
-    <CrateTomlCopy @copyText={{crateTomlText}} />
-    <CrateBadge @crate={{crate}} />
-    {{#each crate.annotated_badges as |badge|}}
+    <LinkTo @route="crate" @model={{this.crate.id}} data-test-crate-link>{{ this.crate.name }}</LinkTo>
+    <CrateTomlCopy @copyText={{this.crateTomlText}} />
+    <CrateBadge @crate={{this.crate}} />
+    {{#each this.crate.annotated_badges as |badge|}}
       {{component badge.component_name badge=badge data-test-badge=badge.badge_type}}
     {{/each}}
   </div>
   <div class='summary' data-test-description>
     <span class='small'>
-      {{ truncate-text crate.description }}
+      {{ truncate-text this.crate.description }}
     </span>
   </div>
 </div>
 <div class='stats'>
   <div class='downloads' data-test-downloads>
     {{svg-jar "download"}}
-    <span class='num'>All-Time: {{ format-num crate.downloads }}</span>
+    <span class='num'>All-Time: {{ format-num this.crate.downloads }}</span>
   </div>
   <div class="recent-downloads" data-test-recent-downloads>
     {{svg-jar "download"}}
-    <span class='num'><abbr title="Downloads in the last 90 days">Recent:</abbr> {{ format-num crate.recent_downloads }}</span>
+    <span class='num'><abbr title="Downloads in the last 90 days">Recent:</abbr> {{ format-num this.crate.recent_downloads }}</span>
   </div>
   <div class="updated-at" >
     {{svg-jar "latest-updates" height="32" width="32"}}
-    <time title="Last updated: {{ crate.updated_at }}" datetime="{{ moment-format crate.updated_at 'YYYY-MM-DDTHH:mm:ssZ' }}" data-test-updated-at>
-      {{ moment-from-now crate.updated_at }}
+    <time title="Last updated: {{ this.crate.updated_at }}" datetime="{{ moment-format this.crate.updated_at 'YYYY-MM-DDTHH:mm:ssZ' }}" data-test-updated-at>
+      {{ moment-from-now this.crate.updated_at }}
     </time>
   </div>
 </div>
 <div class="quick-links">
   <ul>
-    {{#if crate.homepage}}
-      <li><a href="{{crate.homepage}}">Homepage</a></li>
+    {{#if this.crate.homepage}}
+      <li><a href="{{this.crate.homepage}}">Homepage</a></li>
     {{/if}}
-    {{#if crate.documentation}}
-      <li><a href="{{crate.documentation}}">Documentation</a></li>
+    {{#if this.crate.documentation}}
+      <li><a href="{{this.crate.documentation}}">Documentation</a></li>
     {{/if}}
-    {{#if crate.repository}}
-      <li><a href="{{crate.repository}}">Repository</a></li>
+    {{#if this.crate.repository}}
+      <li><a href="{{this.crate.repository}}">Repository</a></li>
     {{/if}}
   </ul>
 </div>
diff --git a/app/templates/components/crate-toml-copy.hbs b/app/templates/components/crate-toml-copy.hbs
index bf381b3cbb5..8cc512edb80 100644
--- a/app/templates/components/crate-toml-copy.hbs
+++ b/app/templates/components/crate-toml-copy.hbs
@@ -1,8 +1,8 @@
-<CopyButton @clipboardText={{copyText}} @success={{action "copySuccess"}} @error={{action "copyError"}} @title="Copy Cargo.toml snippet to clipboard">
+<CopyButton @clipboardText={{this.copyText}} @success={{action "copySuccess"}} @error={{action "copyError"}} @title="Copy Cargo.toml snippet to clipboard">
   {{svg-jar "copy" alt="Copy Cargo.toml snippet to clipboard"}}
-  <div class="copy-notification {{if showSuccess "copy-success" "copy-failure"}}">
-    {{#if showNotification}}
-      {{#if showSuccess}}
+  <div class="copy-notification {{if this.showSuccess "copy-success" "copy-failure"}}">
+    {{#if this.showNotification}}
+      {{#if this.showSuccess}}
         Copied!
       {{else}}
         An error occured. Please use CTRL+C.
diff --git a/app/templates/components/email-input.hbs b/app/templates/components/email-input.hbs
index 6989e867a71..20174c5723e 100644
--- a/app/templates/components/email-input.hbs
+++ b/app/templates/components/email-input.hbs
@@ -1,4 +1,4 @@
-{{#if emailIsNull }}
+{{#if this.emailIsNull }}
   <div class='friendly-message'>
     <p class='small-text'>
       Please add your email address. We will only use
@@ -7,20 +7,20 @@
   </div>
 {{/if}}
 
-{{#if isEditing }}
+{{#if this.isEditing }}
   <div class='row'>
     <div class='label'>
       <dt>Email</dt>
     </div>
     <form class='email-form' {{action 'saveEmail' on='submit'}}>
-      <Input @type={{type}} @value={{value}} placeholder="Email" class="form-control space-right" />
-      {{#if notValidEmail }}
+      <Input @type={{this.type}} @value={{this.value}} placeholder="Email" class="form-control space-right" />
+      {{#if this.notValidEmail }}
         <div class='error'>
           <p class='small-text error'>Whoops, that email format is invalid</p>
         </div>
       {{/if}}
       <div class='actions'>
-        <button type='submit' class='small yellow-button space-right' disabled={{disableSave}}>Save</button>
+        <button type='submit' class='small yellow-button space-right' disabled={{this.disableSave}}>Save</button>
         <button type="button" class='small yellow-button' {{action 'cancelEdit'}}>Cancel</button>
       </div>
     </form>
@@ -32,8 +32,8 @@
     </div>
     <div class='email'>
       <dd class='no-space-left'>
-        {{ user.email }}
-        {{#if user.email_verified}}
+        {{ this.user.email }}
+        {{#if this.user.email_verified}}
           <span class='verified'>Verified!</span>
         {{/if}}
       </dd>
@@ -42,25 +42,25 @@
       <button type="button" class='small yellow-button space-left' {{action 'editEmail'}}>Edit</button>
     </div>
   </div>
-  {{#if emailNotVerified }}
+  {{#if this.emailNotVerified }}
     <div class='row'>
       <div class='label'>
-        {{#if user.email_verification_sent}}
+        {{#if this.user.email_verification_sent}}
           <p class='small-text'>We have sent a verification email to your address.</p>
         {{/if}}
         <p class='small-text'>Your email has not yet been verified.</p>
       </div>
       <div class='actions'>
-        <button type="button" class='small yellow-button space-left' {{action 'resendEmail'}} disabled={{disableResend}}>
-          {{resendButtonText}}
+        <button type="button" class='small yellow-button space-left' {{action 'resendEmail'}} disabled={{this.disableResend}}>
+          {{this.resendButtonText}}
         </button>
       </div>
     </div>
   {{/if}}
-  {{#if isError}}
+  {{#if this.isError}}
     <div class='row'>
       <div class='label'>
-        <p class='small-text'>{{emailError}}</p>
+        <p class='small-text'>{{this.emailError}}</p>
       </div>
     </div>
   {{/if}}
diff --git a/app/templates/components/flash-message.hbs b/app/templates/components/flash-message.hbs
index bd62cd6d1da..324e005bc9a 100644
--- a/app/templates/components/flash-message.hbs
+++ b/app/templates/components/flash-message.hbs
@@ -1 +1 @@
-{{message}}
\ No newline at end of file
+{{this.message}}
\ No newline at end of file
diff --git a/app/templates/components/keyword-list.hbs b/app/templates/components/keyword-list.hbs
index db3c832465e..12c0cda5435 100644
--- a/app/templates/components/keyword-list.hbs
+++ b/app/templates/components/keyword-list.hbs
@@ -1,5 +1,5 @@
 <ul>
-  {{#each keywords as |keyword|}}
+  {{#each this.keywords as |keyword|}}
     <li>
       <LinkTo @route="keyword" @model={{keyword}} class="name">
         <span>{{ keyword.id }} ({{ format-num keyword.crates_cnt }})</span>
diff --git a/app/templates/components/link-to-dep.hbs b/app/templates/components/link-to-dep.hbs
index 6f87dd048b6..e0f26de3ee0 100644
--- a/app/templates/components/link-to-dep.hbs
+++ b/app/templates/components/link-to-dep.hbs
@@ -1,6 +1,6 @@
-<LinkTo @route="crate" @model={{dep.crate_id}}>
-  {{ dep.crate_id }} {{ format-req dep.req }}
+<LinkTo @route="crate" @model={{this.dep.crate_id}}>
+  {{ this.dep.crate_id }} {{ format-req this.dep.req }}
 </LinkTo>
-{{#if dep.optional}}
+{{#if this.dep.optional}}
   <span class='optional'>optional</span>
 {{/if}}
diff --git a/app/templates/components/owned-crate-row.hbs b/app/templates/components/owned-crate-row.hbs
index cf15839c470..4e8254aa3c2 100644
--- a/app/templates/components/owned-crate-row.hbs
+++ b/app/templates/components/owned-crate-row.hbs
@@ -1,11 +1,11 @@
 <Input
   @type="checkbox"
-  @name={{controlId}}
-  @id={{controlId}}
-  @checked={{emailNotifications}}
+  @name={{this.controlId}}
+  @id={{this.controlId}}
+  @checked={{this.emailNotifications}}
   @change={{action "toggleEmailNotifications"}}
   class="form-control"
 />
-<label for="{{ controlId }}">
-  {{ name }}
+<label for="{{ this.controlId }}">
+  {{ this.name }}
 </label>
diff --git a/app/templates/components/pending-owner-invite-row.hbs b/app/templates/components/pending-owner-invite-row.hbs
index 97ca34bb280..7695a8396bb 100644
--- a/app/templates/components/pending-owner-invite-row.hbs
+++ b/app/templates/components/pending-owner-invite-row.hbs
@@ -1,41 +1,41 @@
 <div class='row'>
-  {{#if isAccepted }}
+  {{#if this.isAccepted }}
     <p>
       Success! You've been added as an owner of crate
-      <LinkTo @route="crate" @model={{invite.crate_name}}>{{invite.crate_name}}</LinkTo>.
+      <LinkTo @route="crate" @model={{this.invite.crate_name}}>{{this.invite.crate_name}}</LinkTo>.
     </p>
-  {{else if isDeclined}}
+  {{else if this.isDeclined}}
     <p>
       Declined. You have not been added as an owner of crate
-      <LinkTo @route="crate" @model={{invite.crate_name}}>{{invite.crate_name}}</LinkTo>.
+      <LinkTo @route="crate" @model={{this.invite.crate_name}}>{{this.invite.crate_name}}</LinkTo>.
     </p>
   {{else}}
     <div class='info'>
       <div class='name'>
         <h3>
-          <LinkTo @route="crate" @model={{invite.crate_name}}>
-            {{invite.crate_name}}
+          <LinkTo @route="crate" @model={{this.invite.crate_name}}>
+            {{this.invite.crate_name}}
           </LinkTo>
         </h3>
       </div>
       <div class='invite'>
         <p>
           Invited by:
-          <LinkTo @route="user" @model={{invite.invited_by_username}}>
-            {{invite.invited_by_username}}
+          <LinkTo @route="user" @model={{this.invite.invited_by_username}}>
+            {{this.invite.invited_by_username}}
           </LinkTo>
         </p>
       </div>
       <div class='sent'>
-        <span class='small'>{{moment-from-now invite.created_at}}</span>
+        <span class='small'>{{moment-from-now this.invite.created_at}}</span>
       </div>
       <div class='actions'>
-        <button type="button" class='small yellow-button' {{action 'acceptInvitation' invite}}>Accept</button>
-        <button type="button" class='small yellow-button' {{action 'declineInvitation' invite}}>Decline</button>
+        <button type="button" class='small yellow-button' {{action 'acceptInvitation' this.invite}}>Accept</button>
+        <button type="button" class='small yellow-button' {{action 'declineInvitation' this.invite}}>Decline</button>
       </div>
-      {{#if isError}}
+      {{#if this.isError}}
         <div class='label'>
-          <p class='small-text'>{{inviteError}}</p>
+          <p class='small-text'>{{this.inviteError}}</p>
         </div>
       {{/if}}
     </div>
diff --git a/app/templates/components/rl-dropdown-container.hbs b/app/templates/components/rl-dropdown-container.hbs
index 23d4e908851..0ba2b3eda49 100644
--- a/app/templates/components/rl-dropdown-container.hbs
+++ b/app/templates/components/rl-dropdown-container.hbs
@@ -1 +1 @@
-{{yield dropdownExpanded}}
\ No newline at end of file
+{{yield this.dropdownExpanded}}
\ No newline at end of file
diff --git a/app/templates/components/validated-input.hbs b/app/templates/components/validated-input.hbs
index 63efe0d5bdc..5f83fb74f3e 100644
--- a/app/templates/components/validated-input.hbs
+++ b/app/templates/components/validated-input.hbs
@@ -1,13 +1,13 @@
 <div class='form-group'>
-  <Input @type={{type}} @value={{value}} placeholder={{placeholder}} class="form-control" @name={{valuePath}} />
-  {{#if isValid}}
+  <Input @type={{this.type}} @value={{this.value}} placeholder={{this.placeholder}} class="form-control" @name={{this.valuePath}} />
+  {{#if this.isValid}}
     <span class='valid-input fa fa-check'></span>
   {{/if}}
 
   <div class='input-error'>
-    {{#if showErrorMessage}}
+    {{#if this.showErrorMessage}}
       <div class='error'>
-        {{v-get model valuePath 'message'}}
+        {{v-get this.model this.valuePath 'message'}}
       </div>
     {{/if}}
   </div>
diff --git a/app/templates/crate/docs.hbs b/app/templates/crate/docs.hbs
index 82d4d5c6612..6a5b8f9ebe6 100644
--- a/app/templates/crate/docs.hbs
+++ b/app/templates/crate/docs.hbs
@@ -1,8 +1,8 @@
 <div id="crates-heading">
   {{svg-jar "circle-with-i"}}
-  <h1>Documentation for <em>{{model.name}}</em></h1>
+  <h1>Documentation for <em>{{this.model.name}}</em></h1>
 </div>
 
 <p>
-  Redirecting you to <code>{{model.documentation}}</code>&#8230;
+  Redirecting you to <code>{{this.model.documentation}}</code>&#8230;
 </p>
diff --git a/app/templates/crate/owners.hbs b/app/templates/crate/owners.hbs
index 5feb48ea08c..f8d1b8ce7a6 100644
--- a/app/templates/crate/owners.hbs
+++ b/app/templates/crate/owners.hbs
@@ -3,7 +3,7 @@
 <div id='crates-heading'>
   {{svg-jar "gear"}}
   <h1>Manage Crate Owners</h1>
-  <h2>{{ crate.name }}</h2>
+  <h2>{{ this.crate.name }}</h2>
 </div>
 
 <div id="me-email">
@@ -14,17 +14,17 @@
       <label class="label" for='new-owner-username'>
         Username
       </label>
-      <Input @type="text" @id="new-owner-username" @value={{username}} placeholder="Username" class="form-control space-right" @name="username" />
+      <Input @type="text" @id="new-owner-username" @value={{this.username}} placeholder="Username" class="form-control space-right" @name="username" />
 
-      {{#if error}}
+      {{#if this.error}}
         <div class='error'>
-          <p class='small-text error'>{{error}}</p>
+          <p class='small-text error'>{{this.error}}</p>
         </div>
       {{/if}}
 
-      {{#if invited}}
+      {{#if this.invited}}
         <div class='invited'>
-          <p>{{invited}}</p>
+          <p>{{this.invited}}</p>
         </div>
       {{/if}}
 
@@ -37,14 +37,14 @@
 
 <h2>Owners</h2>
 
-{{#if removed}}
+{{#if this.removed}}
   <div class='removed'>
-    <p>{{removed}}</p>
+    <p>{{this.removed}}</p>
   </div>
 {{/if}}
 
 <div class='owners white-rows'>
-  {{#each crate.owner_user as |user|}}
+  {{#each this.crate.owner_user as |user|}}
     <div class='crate row'>
       <div>
         <LinkTo @route={{user.kind}} @model={{user.login}}>
diff --git a/app/templates/crate/reverse-dependencies.hbs b/app/templates/crate/reverse-dependencies.hbs
index 4fe3108e1f3..fd949c74e28 100644
--- a/app/templates/crate/reverse-dependencies.hbs
+++ b/app/templates/crate/reverse-dependencies.hbs
@@ -1,20 +1,20 @@
 <div class='all-versions-back'>
-  <LinkTo @route="crate" @model={{crate.id}}>&#11013; Back to {{ crate.name }}</LinkTo>
+  <LinkTo @route="crate" @model={{this.crate.id}}>&#11013; Back to {{ this.crate.name }}</LinkTo>
 </div>
 
 <div id='results'>
   <div class='nav'>
     <span class='amt'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> reverse dependencies
-      of <span class='num'>{{ crate.name }}</span>
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> reverse dependencies
+      of <span class='num'>{{ this.crate.name }}</span>
     </span>
   </div>
 </div>
 
 <div class='white-rows'>
-  {{#each model as |dependency|}}
+  {{#each this.model as |dependency|}}
     <div class='crate row'>
       <div>
         <LinkTo @route="crate" @model={{dependency.version.crateName}}>{{dependency.version.crateName}}</LinkTo> requires {{dependency.req}}
@@ -28,15 +28,15 @@
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>
       {{ page }}
     </LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next">
+  <LinkTo @query={{hash page=this.nextPage}} class="next">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/crate/version.hbs b/app/templates/crate/version.hbs
index 433c5319e21..b4734582b6e 100644
--- a/app/templates/crate/version.hbs
+++ b/app/templates/crate/version.hbs
@@ -1,20 +1,20 @@
-{{title crate.name}}
+{{title this.crate.name}}
 
 <div id='crates-heading' data-test-heading>
   <div class="wide">
     <div class='info'>
       {{svg-jar "crate" class='crate-icon'}}
-      <h1 data-test-crate-name>{{ crate.name }}</h1>
-      <h2 data-test-crate-version>{{ currentVersion.num }}</h2>
+      <h1 data-test-crate-name>{{ this.crate.name }}</h1>
+      <h2 data-test-crate-version>{{ this.currentVersion.num }}</h2>
     </div>
 
     <div class='right'>
-      {{#if session.currentUser}}
+      {{#if this.session.currentUser}}
         <button type="button" class='tan-button' {{action 'toggleFollow' this}}>
-          {{#if fetchingFollowing}}
+          {{#if this.fetchingFollowing}}
             <img src="/assets/ajax-loader.gif">
           {{else}}
-            {{#if following}}
+            {{#if this.following}}
               Unfollow
             {{else}}
               Follow
@@ -27,23 +27,23 @@
 
   <div class="quick-links">
     <ul>
-      {{#if crate.homepage}}
-        <li><a href="{{crate.homepage}}">Homepage</a></li>
+      {{#if this.crate.homepage}}
+        <li><a href="{{this.crate.homepage}}">Homepage</a></li>
       {{/if}}
-      {{#if crate.wiki}}
-        <li><a href="{{crate.wiki}}">Wiki</a></li>
+      {{#if this.crate.wiki}}
+        <li><a href="{{this.crate.wiki}}">Wiki</a></li>
       {{/if}}
-      {{#if crate.mailing_list}}
-        <li><a href="{{crate.mailing_list}}">Mailing list</a></li>
+      {{#if this.crate.mailing_list}}
+        <li><a href="{{this.crate.mailing_list}}">Mailing list</a></li>
       {{/if}}
-      {{#if crate.documentation}}
-        <li><a href="{{crate.documentation}}">Documentation</a></li>
+      {{#if this.crate.documentation}}
+        <li><a href="{{this.crate.documentation}}">Documentation</a></li>
       {{/if}}
-      {{#if crate.repository}}
-        <li><a href="{{crate.repository}}">Repository</a></li>
+      {{#if this.crate.repository}}
+        <li><a href="{{this.crate.repository}}">Repository</a></li>
       {{/if}}
       <li>
-        <LinkTo @route="crate.reverse-dependencies" @query={{hash dependency=crate.crate_id}} data-test-reverse-deps-link>
+        <LinkTo @route="crate.reverse-dependencies" @query={{hash dependency=this.crate.crate_id}} data-test-reverse-deps-link>
           Dependent crates
         </LinkTo>
       </li>
@@ -53,61 +53,61 @@
 
 <div class='crate-info'>
   <div class='docs'>
-    {{#if currentVersion.yanked}}
+    {{#if this.currentVersion.yanked}}
       <p>
         This crate has been yanked, but it is still available for download for other crates that
         may be depending on it.
       </p>
       <p>
-        You may wish to <LinkTo @route="crate.versions" @model={{crate}}>view all versions</LinkTo> to find
+        You may wish to <LinkTo @route="crate.versions" @model={{this.crate}}>view all versions</LinkTo> to find
         one that has not been yanked.
       </p>
     {{else}}
       <div class='install'>
         <div class='action'>Cargo.toml</div>
-        <code id="crate-toml">{{ crateTomlText }}</code>
+        <code id="crate-toml">{{ this.crateTomlText }}</code>
         {{#if (is-clipboard-supported)}}
-          <CrateTomlCopy @copyText={{crateTomlText}} />
+          <CrateTomlCopy @copyText={{this.crateTomlText}} />
         {{/if}}
       </div>
-      {{#if crate.readme}}
+      {{#if this.crate.readme}}
         <section class="crate-readme" aria-label="Readme">
-          <CrateReadme @rendered={{crate.readme}} />
+          <CrateReadme @rendered={{this.crate.readme}} />
         </section>
       {{else}}
-        {{#if crate.description}}
+        {{#if this.crate.description}}
           <div class='about'>
             <h3>About This Package</h3>
-            <p>{{ crate.description }}</p>
+            <p>{{ this.crate.description }}</p>
           </div>
         {{/if}}
       {{/if}}
     {{/if}}
   </div>
-  {{#if notYankedOrIsOwner}}
+  {{#if this.notYankedOrIsOwner}}
     <section class='authorship' aria-label="Crate metadata">
       <div class='top'>
         <div>
           <div class='last-update'><span class='small'>Last Updated</span></div>
-          <div class='{{if currentVersion.crate_size 'date-with-small-margin-bot' 'date'}}'>{{moment-from-now crate.updated_at}}</div>
-          {{#each crate.annotated_badges as |badge|}}
+          <div class='{{if this.currentVersion.crate_size 'date-with-small-margin-bot' 'date'}}'>{{moment-from-now this.crate.updated_at}}</div>
+          {{#each this.crate.annotated_badges as |badge|}}
             <p>
               {{component badge.component_name badge=badge}}
             </p>
           {{/each}}
         </div>
 
-        {{#if currentVersion.crate_size}}
+        {{#if this.currentVersion.crate_size}}
           <div>
             <div class='crate-size'><span class='small'>Crate Size</span></div>
-            <div class='size'>{{format-crate-size currentVersion.crate_size}}</div>
+            <div class='size'>{{format-crate-size this.currentVersion.crate_size}}</div>
           </div>
         {{/if}}
 
         <div class="authors">
           <h3>Authors</h3>
           <ul>
-            {{#each displayedAuthors as |author|}}
+            {{#each this.displayedAuthors as |author|}}
               <li>{{ format-email author.name }}</li>
             {{/each}}
           </ul>
@@ -115,19 +115,19 @@
       </div>
 
       <div class='bottom'>
-        {{#if currentVersion.license}}
+        {{#if this.currentVersion.license}}
           <div>
             <h3>License</h3>
-            <p class="license" data-test-license>{{ currentVersion.license }}</p>
+            <p class="license" data-test-license>{{ this.currentVersion.license }}</p>
           </div>
         {{/if}}
 
-        {{#unless crate.keywords.isPending}}
-          {{#if anyKeywords}}
+        {{#unless this.crate.keywords.isPending}}
+          {{#if this.anyKeywords}}
             <div>
               <h3>Keywords</h3>
               <ul class='keywords'>
-                {{#each keywords as |keyword|}}
+                {{#each this.keywords as |keyword|}}
                   <li><LinkTo @route="keyword" @model={{keyword}}>{{keyword.id}}</LinkTo></li>
                 {{/each}}
               </ul>
@@ -135,12 +135,12 @@
           {{/if}}
         {{/unless}}
 
-        {{#unless crate.categories.isPending}}
-          {{#if anyCategories}}
+        {{#unless this.crate.categories.isPending}}
+          {{#if this.anyCategories}}
             <div>
               <h3>Categories</h3>
               <ul class='categories'>
-                {{#each categories as |category|}}
+                {{#each this.categories as |category|}}
                   <li><LinkTo @route="category" @model={{category.slug}}>{{category.category}}</LinkTo></li>
                 {{/each}}
               </ul>
@@ -151,16 +151,16 @@
         <div id='crate-owners'>
           <h3>Owners</h3>
 
-          {{#if isOwner}}
+          {{#if this.isOwner}}
             <p>
-              <LinkTo @route="crate.owners" @model={{crate}}>
+              <LinkTo @route="crate.owners" @model={{this.crate}}>
                 Manage owners
               </LinkTo>
             </p>
           {{/if}}
 
           <ul class='owners' data-test-owners>
-            {{#each crate.owner_team as |team|}}
+            {{#each this.crate.owner_team as |team|}}
               <li>
                 <LinkTo @route={{team.kind}} @model={{team.login}} data-test-team-link={{team.login}}>
                   <UserAvatar @user={{team}} @size="medium-small" />
@@ -168,7 +168,7 @@
               </li>
             {{/each}}
 
-            {{#each crate.owner_user as |user|}}
+            {{#each this.crate.owner_user as |user|}}
               <li>
                 <LinkTo @route={{user.kind}} @model={{user.login}} data-test-user-link={{user.login}}>
                   <UserAvatar @user={{user}} @size="medium-small" />
@@ -181,7 +181,7 @@
         <div class='section' id='crate-versions' data-test-versions>
           <h3>Versions</h3>
           <ul>
-            {{#each smallSortedVersions as |version|}}
+            {{#each this.smallSortedVersions as |version|}}
               <li>
                 <LinkTo @route="crate.version" @model={{version.num}} data-test-version-link={{version.num}}>
                   {{ version.num }}
@@ -194,9 +194,9 @@
             {{/each}}
           </ul>
           <span class='small'>
-            {{#if hasMoreVersions}}
-              <LinkTo @route="crate.versions" @model={{crate}} data-test-all-versions-link>
-                show all {{ crate.versions.length }} versions
+            {{#if this.hasMoreVersions}}
+              <LinkTo @route="crate.versions" @model={{this.crate}} data-test-all-versions-link>
+                show all {{ this.crate.versions.length }} versions
               </LinkTo>
             {{/if}}
           </span>
@@ -205,10 +205,10 @@
         <div class='section' id='crate-dependencies'>
           <h3>Dependencies</h3>
           <ul>
-            {{#each currentDependencies as |dep|}}
+            {{#each this.currentDependencies as |dep|}}
               <LinkToDep @tagName="li" @dep={{dep}} />
             {{else}}
-              {{#if (is-pending currentDependencies)}}
+              {{#if (is-pending this.currentDependencies)}}
                 <li>Loading…</li>
               {{else}}
                 <li>None</li>
@@ -217,22 +217,22 @@
           </ul>
         </div>
 
-        {{#if currentBuildDependencies}}
+        {{#if this.currentBuildDependencies}}
           <div class='section' id='crate-build-dependencies'>
             <h3>Build-Dependencies</h3>
             <ul>
-              {{#each currentBuildDependencies as |dep|}}
+              {{#each this.currentBuildDependencies as |dep|}}
                 <LinkToDep @tagName="li" @dep={{dep}} />
               {{/each}}
             </ul>
           </div>
         {{/if}}
 
-        {{#if currentDevDependencies}}
+        {{#if this.currentDevDependencies}}
           <div class='section' id='crate-dev-dependencies'>
             <h3>Dev-Dependencies</h3>
             <ul>
-              {{#each currentDevDependencies as |dep|}}
+              {{#each this.currentDevDependencies as |dep|}}
                 <LinkToDep @tagName="li" @dep={{dep}} />
               {{/each}}
             </ul>
@@ -243,28 +243,28 @@
   {{/if}}
 </div>
 
-{{#unless currentVersion.yanked}}
+{{#unless this.currentVersion.yanked}}
   <div id='crate-downloads'>
     <div class='stats'>
       <h3>Stats Overview</h3>
       <div class='stat'>
         <span class='num'>
           {{svg-jar "download"}}
-          <span class="num__align">{{ format-num downloadsContext.downloads }}</span>
+          <span class="num__align">{{ format-num this.downloadsContext.downloads }}</span>
         </span>
         <span class='desc small'>Downloads all time</span>
       </div>
       <div class='stat'>
-        <span class="{{if crate.versions.isPending 'loading'}} num">
+        <span class="{{if this.crate.versions.isPending 'loading'}} num">
           {{svg-jar "crate"}}
-          <span class="num__align">{{ crate.versions.length }}</span>
+          <span class="num__align">{{ this.crate.versions.length }}</span>
         </span>
         <span class='desc small'>Versions published</span>
       </div>
     </div>
     <div class='graph'>
       <h4>Downloads over the last 90 days</h4>
-      <DownloadGraph @data={{downloadData}} />
+      <DownloadGraph @data={{this.downloadData}} />
     </div>
   </div>
 {{/unless}}
diff --git a/app/templates/crate/versions.hbs b/app/templates/crate/versions.hbs
index 60dc6988e2a..5e776cde5e1 100644
--- a/app/templates/crate/versions.hbs
+++ b/app/templates/crate/versions.hbs
@@ -1,17 +1,17 @@
 <div class='all-versions-back'>
-  <LinkTo @route="crate" @model={{model}}>&#11013; Back to Main Page</LinkTo>
+  <LinkTo @route="crate" @model={{this.model}}>&#11013; Back to Main Page</LinkTo>
 </div>
 
 <div class='info'>
   <span class='small'>
-    All <span class='num'>{{ model.versions.length }}</span>
-    versions of <span class='num'>{{ model.name }}</span> since
-    {{moment-format model.created_at 'LL'}}
+    All <span class='num'>{{ this.model.versions.length }}</span>
+    versions of <span class='num'>{{ this.model.name }}</span> since
+    {{moment-format this.model.created_at 'LL'}}
   </span>
 </div>
 
 <div id='crate-all-versions' class='white-rows'>
-  {{#each model.versions as |version|}}
+  {{#each this.model.versions as |version|}}
     <div class='row'>
       <div>
         <LinkTo @route="crate.version" @model={{version.num}}>{{ version.num }}</LinkTo>
diff --git a/app/templates/crates.hbs b/app/templates/crates.hbs
index 5b7533243f8..94054765d5e 100644
--- a/app/templates/crates.hbs
+++ b/app/templates/crates.hbs
@@ -5,13 +5,13 @@
     {{svg-jar "crate"}}
     <h1>All Crates</h1>
   </div>
-  {{#if letter}}
-    <h2>starting with '{{ letter }}'</h2>
+  {{#if this.letter}}
+    <h2>starting with '{{ this.letter }}'</h2>
   {{/if}}
 </div>
 
 <div id='selection'>
-  {{#each alphabet as |letter|}}
+  {{#each this.alphabet as |letter|}}
     <LinkTo @query={{hash letter=letter page=1}}>
       {{ letter }}
     </LinkTo>
@@ -19,7 +19,7 @@
 
   <select {{on "change" (action "handleSelection")}}>
     <option>Filter by the letter...</option>
-    {{#each alphabet as |letter|}}
+    {{#each this.alphabet as |letter|}}
       <option value={{letter}} selected={{eq letter this.letter}}>{{ letter }}</option>
     {{/each}}
   </select>
@@ -29,8 +29,8 @@
   <div class='nav' data-test-crates-nav>
     <span class='amt small'>
       Displaying
-      <span class='cur' data-test-current-rows>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total' data-test-total-rows>{{ totalItems }}</span> total results
+      <span class='cur' data-test-current-rows>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total' data-test-total-rows>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -40,7 +40,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -71,17 +71,17 @@
 </div>
 
 <div id='crates' class='white-rows'>
-  {{#each model as |crate index|}}
+  {{#each this.model as |crate index|}}
     <CrateRow @crate={{crate}} data-test-crate-row={{index}} />
   {{/each}}
 </div>
 
 <nav class='pagination' aria-label="Pagination navigation">
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page" data-test-pagination-prev>
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page" data-test-pagination-prev>
     {{svg-jar "left-pag"}}
   </LinkTo>
   <ol>
-    {{#each pages as |page|}}
+    {{#each this.pages as |page|}}
       <li>
         <LinkTo @query={{hash page=page}} @title={{concat "Go to page " page}}>
           {{ page }}
@@ -89,7 +89,7 @@
       </li>
     {{/each}}
   </ol>
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page" data-test-pagination-next>
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page" data-test-pagination-next>
     {{svg-jar "right-pag"}}
   </LinkTo>
 </nav>
diff --git a/app/templates/dashboard.hbs b/app/templates/dashboard.hbs
index 7fadc86cbea..25eb8393f30 100644
--- a/app/templates/dashboard.hbs
+++ b/app/templates/dashboard.hbs
@@ -6,7 +6,7 @@
   <div id="stats">
     <div class='downloads'>
       <img class="download" src="/assets/download.svg">
-      <span class='num'>{{format-num visibleStats.total_downloads}}</span>
+      <span class='num'>{{format-num this.visibleStats.total_downloads}}</span>
       <span class='desc small'>Total Downloads</span>
     </div>
   </div>
@@ -22,13 +22,13 @@
           My Crates
         </h2>
 
-        {{#if hasMoreCrates}}
+        {{#if this.hasMoreCrates}}
           <span class='small'>
             <LinkTo @route="me.crates">Show all</LinkTo>
           </span>
         {{/if}}
       </div>
-      <CrateDownloadsList @crates={{visibleCrates}} />
+      <CrateDownloadsList @crates={{this.visibleCrates}} />
     </div>
     <div id='my-following'>
       <div class='header'>
@@ -37,13 +37,13 @@
           Following
         </h2>
 
-        {{#if hasMoreFollowing}}
+        {{#if this.hasMoreFollowing}}
           <span class='small'>
             <LinkTo @route="me.following">Show all</LinkTo>
           </span>
         {{/if}}
       </div>
-      <CrateDownloadsList @crates={{visibleFollowing}} />
+      <CrateDownloadsList @crates={{this.visibleFollowing}} />
     </div>
   </div>
 
@@ -54,7 +54,7 @@
     </h2>
 
     <div class='white-rows'>
-      {{#each myFeed as |version|}}
+      {{#each this.myFeed as |version|}}
         <div class='row'>
           <div class='info'>
             <LinkTo @route="crate.version" @models={{array version.crateName version.num}}>
@@ -68,12 +68,12 @@
         </div>
       {{/each}}
 
-      {{#if loadingMore}}
+      {{#if this.loadingMore}}
         <span class='load-more'>
           <img src="/assets/ajax-loader.gif">
         </span>
       {{else}}
-        {{#if hasMore}}
+        {{#if this.hasMore}}
           <button type="button" class='load-more' {{ action 'loadMore' }}>
             Load More
           </button>
diff --git a/app/templates/error.hbs b/app/templates/error.hbs
index 95e6ededdb7..ba5eb0cd7ce 100644
--- a/app/templates/error.hbs
+++ b/app/templates/error.hbs
@@ -1,5 +1,5 @@
 <h1>Something Went Wrong!</h1>
-<h5>{{model.message}}</h5>
+<h5>{{this.model.message}}</h5>
 <pre>
-  {{model.stack}}
+  {{this.model.stack}}
 </pre>
diff --git a/app/templates/head.hbs b/app/templates/head.hbs
index 2f1010578b8..8542c076240 100644
--- a/app/templates/head.hbs
+++ b/app/templates/head.hbs
@@ -1,2 +1,2 @@
-<title>{{ model.title }}</title>
-<HeadTags @headTags={{model.headTags}} />
+<title>{{ this.model.title }}</title>
+<HeadTags @headTags={{this.model.headTags}} />
diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 1d5743516ef..9a32236f93b 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -24,40 +24,40 @@
   <div id='stats'>
     <div class='downloads'>
       {{svg-jar "download"}}
-      <span class='num' data-test-total-downloads>{{if hasData (format-num model.num_downloads) "---,---,---"}}</span>
+      <span class='num' data-test-total-downloads>{{if this.hasData (format-num this.model.num_downloads) "---,---,---"}}</span>
       <span class='desc small'>Downloads</span>
     </div>
     <div class='crates'>
       {{svg-jar "crate"}}
-      <span class='num' data-test-total-crates>{{if hasData (format-num model.num_crates) "---,---"}}</span>
+      <span class='num' data-test-total-crates>{{if this.hasData (format-num this.model.num_crates) "---,---"}}</span>
       <span class='desc small'>Crates in stock</span>
     </div>
   </div>
 </div>
 
 <div id='home-crates' class='crate-lists'>
-  <section id='new-crates' data-test-new-crates aria-busy="{{dataTask.isRunning}}">
+  <section id='new-crates' data-test-new-crates aria-busy="{{this.dataTask.isRunning}}">
     <h2>New Crates</h2>
-    <CrateList @crates={{model.new_crates}} />
+    <CrateList @crates={{this.model.new_crates}} />
   </section>
-  <section id='most-downloaded' data-test-most-downloaded aria-busy="{{dataTask.isRunning}}">
+  <section id='most-downloaded' data-test-most-downloaded aria-busy="{{this.dataTask.isRunning}}">
     <h2>Most Downloaded</h2>
-    <CrateList @crates={{model.most_downloaded}} />
+    <CrateList @crates={{this.model.most_downloaded}} />
   </section>
-  <section id='just-updated' data-test-just-updated aria-busy="{{dataTask.isRunning}}">
+  <section id='just-updated' data-test-just-updated aria-busy="{{this.dataTask.isRunning}}">
     <h2>Just Updated</h2>
-    <CrateList @crates={{model.just_updated}} />
+    <CrateList @crates={{this.model.just_updated}} />
   </section>
-  <section id='most-recently-downloaded' data-test-most-recently-downloaded aria-busy="{{dataTask.isRunning}}">
+  <section id='most-recently-downloaded' data-test-most-recently-downloaded aria-busy="{{this.dataTask.isRunning}}">
     <h2>Most Recent Downloads</h2>
-    <CrateList @crates={{model.most_recently_downloaded}} />
+    <CrateList @crates={{this.model.most_recently_downloaded}} />
   </section>
-  <section id='keywords' data-test-keywords aria-busy="{{dataTask.isRunning}}">
+  <section id='keywords' data-test-keywords aria-busy="{{this.dataTask.isRunning}}">
     <h2>Popular Keywords <LinkTo @route="keywords">(see all)</LinkTo></h2>
-    <KeywordList @keywords={{model.popular_keywords}} />
+    <KeywordList @keywords={{this.model.popular_keywords}} />
   </section>
-  <section id='categories' data-test-categories aria-busy="{{dataTask.isRunning}}">
+  <section id='categories' data-test-categories aria-busy="{{this.dataTask.isRunning}}">
     <h2>Popular Categories <LinkTo @route="categories">(see all)</LinkTo></h2>
-    <CategoryList @categories={{model.popular_categories}} />
+    <CategoryList @categories={{this.model.popular_categories}} />
   </section>
 </div>
diff --git a/app/templates/keyword/index.hbs b/app/templates/keyword/index.hbs
index 17c6033cb65..917cb8a90d3 100644
--- a/app/templates/keyword/index.hbs
+++ b/app/templates/keyword/index.hbs
@@ -1,17 +1,17 @@
-{{ title keyword.keyword ' - Keywords' }}
+{{ title this.keyword.keyword ' - Keywords' }}
 
 <div id='crates-heading'>
   {{svg-jar "crate"}}
   <h1>All Crates</h1>
-  <h2>for keyword '{{ keyword.keyword }}'</h2>
+  <h2>for keyword '{{ this.keyword.keyword }}'</h2>
 </div>
 
 <div id='results'>
   <div class='nav' data-test-keyword-nav>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -20,7 +20,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -51,19 +51,19 @@
 </div>
 
 <div id='crates' class='white-rows'>
-  {{#each model as |crate|}}
+  {{#each this.model as |crate|}}
     <CrateRow @crate={{crate}} />
   {{/each}}
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/keywords.hbs b/app/templates/keywords.hbs
index 283e7fbea49..dbab786cb31 100644
--- a/app/templates/keywords.hbs
+++ b/app/templates/keywords.hbs
@@ -9,8 +9,8 @@
   <div class='nav' data-test-keywords-nav>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -19,7 +19,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -40,7 +40,7 @@
 </div>
 
 <div class='white-rows'>
-  {{#each model as |keyword|}}
+  {{#each this.model as |keyword|}}
     <div class='row'>
       <div class='info'>
         <LinkTo @route="keyword" @model={{keyword}}>{{keyword.id}}</LinkTo>
@@ -53,13 +53,13 @@
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/me/crates.hbs b/app/templates/me/crates.hbs
index eaeb99825a0..dfddf96d41f 100644
--- a/app/templates/me/crates.hbs
+++ b/app/templates/me/crates.hbs
@@ -11,8 +11,8 @@
   <div class='nav'>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -21,7 +21,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown">
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -52,19 +52,19 @@
 </div>
 
 <div id='crates' class='white-rows'>
-  {{#each model as |crate|}}
+  {{#each this.model as |crate|}}
     <CrateRow @crate={{crate}} />
   {{/each}}
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/me/following.hbs b/app/templates/me/following.hbs
index c23421ab5e0..2fcbdaf61e6 100644
--- a/app/templates/me/following.hbs
+++ b/app/templates/me/following.hbs
@@ -9,8 +9,8 @@
   <div class='nav'>
     <span class='amt small'>
       Displaying
-      <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-      of <span class='total'>{{ totalItems }}</span> total results
+      <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+      of <span class='total'>{{ this.totalItems }}</span> total results
     </span>
   </div>
 
@@ -19,7 +19,7 @@
     <RlDropdownContainer class="dropdown-container">
       <RlDropdownToggle @tagName="a" class="dropdown">
         {{svg-jar "sort"}}
-        {{ currentSortBy }}
+        {{ this.currentSortBy }}
         <span class='arrow'></span>
       </RlDropdownToggle>
 
@@ -40,19 +40,19 @@
 </div>
 
 <div id='crates' class='white-rows'>
-  {{#each model as |crate|}}
+  {{#each this.model as |crate|}}
     <CrateRow @crate={{crate}} />
   {{/each}}
 </div>
 
 <div class='pagination'>
-  <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+  <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
     {{svg-jar "left-pag"}}
   </LinkTo>
-  {{#each pages as |page|}}
+  {{#each this.pages as |page|}}
     <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
   {{/each}}
-  <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+  <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
     {{svg-jar "right-pag"}}
   </LinkTo>
 </div>
diff --git a/app/templates/me/index.hbs b/app/templates/me/index.hbs
index 1d64b3a70bb..83f43661cbe 100644
--- a/app/templates/me/index.hbs
+++ b/app/templates/me/index.hbs
@@ -9,20 +9,20 @@
   <h2>Profile Information</h2>
 
   <div class='info'>
-    <UserLink @user={{model.user}}> <UserAvatar @user={{model.user}} @size="medium" /> </UserLink>
+    <UserLink @user={{this.model.user}}> <UserAvatar @user={{this.model.user}} @size="medium" /> </UserLink>
 
     <dl>
       <dt>Name</dt>
-      <dd>{{ model.user.name }}</dd>
+      <dd>{{ this.model.user.name }}</dd>
       <dt>GitHub Account</dt>
-      <dd>{{ model.user.login }}</dd>
+      <dd>{{ this.model.user.login }}</dd>
     </dl>
   </div>
 </div>
 
 <div id='me-email'>
   <h2>User Email</h2>
-  <EmailInput @type="email" @value={{model.user.email}} @user={{model.user}} />
+  <EmailInput @type="email" @value={{this.model.user.email}} @user={{this.model.user}} />
 </div>
 
 <form id='me-email-notifications' {{ action 'saveEmailNotifications' on='submit' }} >
@@ -45,19 +45,19 @@
 
   <div class='row'>
     <ul>
-      {{#each ownedCrates as |ownedCrate|}}
+      {{#each this.ownedCrates as |ownedCrate|}}
         <OwnedCrateRow @ownedCrate={{ownedCrate}} />
       {{/each}}
     </ul>
   </div>
 
   <div class='row'>
-    {{#if emailNotificationsError}}
+    {{#if this.emailNotificationsError}}
       <div class='error'>
         An error occurred while saving your email preferences.
       </div>
     {{/if}}
-    {{#if emailNotificationsSuccess}}
+    {{#if this.emailNotificationsSuccess}}
       <div class='success'>
         Your email notification preferences have been updated!
       </div>
@@ -72,7 +72,7 @@
   <div class='me-subheading'>
     <h2>API Access</h2>
     <div class='right'>
-      <button type="button" class='yellow-button' disabled={{disableCreate}} {{action "startNewToken"}}>New Token</button>
+      <button type="button" class='yellow-button' disabled={{this.disableCreate}} {{action "startNewToken"}}>New Token</button>
     </div>
   </div>
 
@@ -87,7 +87,7 @@
   </p>
 
   <div id='tokens'>
-    {{#each sortedTokens as |api_token|}}
+    {{#each this.sortedTokens as |api_token|}}
       <ApiTokenRow @api_token={{api_token}} />
     {{/each}}
   </div>
diff --git a/app/templates/me/pending-invites.hbs b/app/templates/me/pending-invites.hbs
index 8748702b5b9..27d8c49aa91 100644
--- a/app/templates/me/pending-invites.hbs
+++ b/app/templates/me/pending-invites.hbs
@@ -7,7 +7,7 @@
 
 <div id='my-invites'>
   <div class='white-rows'>
-    {{#each model as |invite|}}
+    {{#each this.model as |invite|}}
       <PendingOwnerInviteRow @invite={{invite}} />
     {{else}}
       <p>You don't seem to have any pending invitations.</p>
diff --git a/app/templates/search.hbs b/app/templates/search.hbs
index e6adf8160e7..9843cfc698b 100644
--- a/app/templates/search.hbs
+++ b/app/templates/search.hbs
@@ -1,28 +1,28 @@
-{{title (concat "Search Results for '" q "'")}}
+{{title (concat "Search Results for '" this.q "'")}}
 
 <div id='crates-heading' class='crate-search' data-test-heading>
   <div class='info'>
     {{svg-jar "magnifier" width=32 height=32}}
     <h1>Search Results</h1>
   </div>
-  {{#if q}}
-    <h2>for '{{ q }}'</h2>
+  {{#if this.q}}
+    <h2>for '{{ this.q }}'</h2>
   {{/if}}
 
-  {{#if dataTask.isRunning}}<img src="/assets/ajax-loader.gif" class="loading-spinner">{{/if}}
+  {{#if this.dataTask.isRunning}}<img src="/assets/ajax-loader.gif" class="loading-spinner">{{/if}}
 </div>
 
-{{#if firstResultPending}}
+{{#if this.firstResultPending}}
   <div id="no-results">
     <h2>Loading search results...</h2>
   </div>
-{{else if hasItems}}
+{{else if this.hasItems}}
   <div id='results'>
     <div class='nav' data-test-search-nav>
       <span class='amt'>
         Displaying
-        <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-          of <span class='total'>{{ totalItems }}</span> total results
+        <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+          of <span class='total'>{{ this.totalItems }}</span> total results
       </span>
     </div>
 
@@ -32,7 +32,7 @@
       <RlDropdownContainer class="dropdown-container">
         <RlDropdownToggle @tagName="a" class="dropdown" data-test-current-order>
           {{svg-jar "sort"}}
-          {{ currentSortBy }}
+          {{ this.currentSortBy }}
           <span class='arrow'></span>
         </RlDropdownToggle>
 
@@ -63,7 +63,7 @@
   </div>
 
   <div id='crates' class='white-rows'>
-    {{#each model as |crate index|}}
+    {{#each this.model as |crate index|}}
       {{#if crate.exact_match}}
         <div class='exact-match'>
           <LinkTo @route="crate" @model={{crate}}>
@@ -80,13 +80,13 @@
   </div>
 
   <div class='pagination'>
-    <LinkTo @query={{hash page=prevPage}} class="prev">
+    <LinkTo @query={{hash page=this.prevPage}} class="prev">
       {{svg-jar "left-pag"}}
     </LinkTo>
-    {{#each pages as |page|}}
+    {{#each this.pages as |page|}}
       <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
     {{/each}}
-    <LinkTo @query={{hash page=nextPage}} class="next">
+    <LinkTo @query={{hash page=this.nextPage}} class="next">
       {{svg-jar "right-pag"}}
     </LinkTo>
   </div>
diff --git a/app/templates/team.hbs b/app/templates/team.hbs
index 98a691bb80f..162c2ab3fa2 100644
--- a/app/templates/team.hbs
+++ b/app/templates/team.hbs
@@ -1,16 +1,16 @@
 <div id='crates-heading' data-test-heading>
   <div class="wide">
     <div class='info'>
-      <UserAvatar @user={{model.team}} @size="medium" data-test-avatar />
+      <UserAvatar @user={{this.model.team}} @size="medium" data-test-avatar />
       <div class='team-info'>
         <h1 data-test-org-name>
-          {{ model.team.org_name }}
+          {{ this.model.team.org_name }}
         </h1>
         <h2 data-test-team-name>
-          {{ model.team.name }}
+          {{ this.model.team.name }}
         </h2>
       </div>
-      <UserLink @user={{model.team}} data-test-github-link>
+      <UserLink @user={{this.model.team}} data-test-github-link>
         <img alt="GitHub profile" title="GitHub profile" src="/assets/GitHub-Mark.svg">
       </UserLink>
     </div>
@@ -25,8 +25,8 @@
       <div class='nav'>
         <span class='amt small'>
           Displaying
-          <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-          of <span class='total'>{{ totalItems }}</span> total results
+          <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+          of <span class='total'>{{ this.totalItems }}</span> total results
         </span>
       </div>
 
@@ -35,7 +35,7 @@
         <RlDropdownContainer class="dropdown-container">
           <RlDropdownToggle @tagName="a" class="dropdown">
             {{svg-jar "sort"}}
-            {{ currentSortBy }}
+            {{ this.currentSortBy }}
             <span class='arrow'></span>
           </RlDropdownToggle>
 
@@ -66,19 +66,19 @@
     </div>
 
     <div id='crates' class='white-rows'>
-      {{#each model.crates as |crate|}}
+      {{#each this.model.crates as |crate|}}
         <CrateRow @crate={{crate}} />
       {{/each}}
     </div>
 
     <div class='pagination'>
-      <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+      <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
         {{svg-jar "left-pag"}}
       </LinkTo>
-      {{#each pages as |page|}}
+      {{#each this.pages as |page|}}
         <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
       {{/each}}
-      <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+      <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
         {{svg-jar "right-pag"}}
       </LinkTo>
     </div>
diff --git a/app/templates/user.hbs b/app/templates/user.hbs
index 953065b2ead..fd9b2c54fac 100644
--- a/app/templates/user.hbs
+++ b/app/templates/user.hbs
@@ -1,9 +1,9 @@
 <div id='crates-heading' data-test-heading>
-  <UserAvatar @user={{model.user}} @size="medium" data-test-avatar />
+  <UserAvatar @user={{this.model.user}} @size="medium" data-test-avatar />
   <h1 data-test-username>
-    {{ model.user.login }}
+    {{ this.model.user.login }}
   </h1>
-  <UserLink @user={{model.user}} data-test-user-link>
+  <UserLink @user={{this.model.user}} data-test-user-link>
     <img alt="GitHub profile" title="GitHub profile" src="/assets/GitHub-Mark.svg">
   </UserLink>
 </div>
@@ -16,8 +16,8 @@
       <div class='nav'>
         <span class='amt small'>
           Displaying
-          <span class='cur'>{{ currentPageStart }}-{{ currentPageEnd }}</span>
-          of <span class='total'>{{ totalItems }}</span> total results
+          <span class='cur'>{{ this.currentPageStart }}-{{ this.currentPageEnd }}</span>
+          of <span class='total'>{{ this.totalItems }}</span> total results
         </span>
       </div>
 
@@ -26,7 +26,7 @@
         <RlDropdownContainer class="dropdown-container">
           <RlDropdownToggle @tagName="a" class="dropdown">
             {{svg-jar "sort"}}
-            {{ currentSortBy }}
+            {{ this.currentSortBy }}
             <span class='arrow'></span>
           </RlDropdownToggle>
 
@@ -57,19 +57,19 @@
     </div>
 
     <div id='crates' class='white-rows'>
-      {{#each model.crates as |crate|}}
+      {{#each this.model.crates as |crate|}}
         <CrateRow @crate={{crate}} />
       {{/each}}
     </div>
 
     <div class='pagination'>
-      <LinkTo @query={{hash page=prevPage}} class="prev" @rel="prev" @title="previous page">
+      <LinkTo @query={{hash page=this.prevPage}} class="prev" @rel="prev" @title="previous page">
         {{svg-jar "left-pag"}}
       </LinkTo>
-      {{#each pages as |page|}}
+      {{#each this.pages as |page|}}
         <LinkTo @query={{hash page=page}}>{{ page }}</LinkTo>
       {{/each}}
-      <LinkTo @query={{hash page=nextPage}} class="next" @rel="next" @title="next page">
+      <LinkTo @query={{hash page=this.nextPage}} class="next" @rel="next" @title="next page">
         {{svg-jar "right-pag"}}
       </LinkTo>
     </div>