diff --git a/addon/components/paper-button.hbs b/addon/components/paper-button.hbs
index 10ba7b34f..79afe4288 100644
--- a/addon/components/paper-button.hbs
+++ b/addon/components/paper-button.hbs
@@ -1,8 +1,8 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 {{#if (has-block)}}
   {{yield}}
 {{else}}
-  {{label}}
+  {{@label}}
 {{/if}}
 
 <PaperRipple
diff --git a/addon/components/paper-card-media.hbs b/addon/components/paper-card-media.hbs
index ff4629985..eb1835447 100644
--- a/addon/components/paper-card-media.hbs
+++ b/addon/components/paper-card-media.hbs
@@ -1,8 +1,7 @@
-{{! template-lint-disable no-implicit-this }}
 {{#if (has-block)}}
-  <div class="md-media-{{size}}">
+  <div class="md-media-{{this.size}}">
     {{yield}}
   </div>
 {{else}}
-  <img class="md-media-{{size}}" src={{src}} alt={{alt}} title={{title}}>
+  <img class="md-media-{{this.size}}" src={{@src}} alt={{@alt}} title={{@title}}>
 {{/if}}
\ No newline at end of file
diff --git a/addon/components/paper-card-title-media.hbs b/addon/components/paper-card-title-media.hbs
index ff4629985..eb1835447 100644
--- a/addon/components/paper-card-title-media.hbs
+++ b/addon/components/paper-card-title-media.hbs
@@ -1,8 +1,7 @@
-{{! template-lint-disable no-implicit-this }}
 {{#if (has-block)}}
-  <div class="md-media-{{size}}">
+  <div class="md-media-{{this.size}}">
     {{yield}}
   </div>
 {{else}}
-  <img class="md-media-{{size}}" src={{src}} alt={{alt}} title={{title}}>
+  <img class="md-media-{{this.size}}" src={{@src}} alt={{@alt}} title={{@title}}>
 {{/if}}
\ No newline at end of file
diff --git a/addon/components/paper-checkbox.hbs b/addon/components/paper-checkbox.hbs
index 4348a6b98..09128b63d 100644
--- a/addon/components/paper-checkbox.hbs
+++ b/addon/components/paper-checkbox.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 <div class="md-container">
   <div class="md-icon"></div>
   <PaperRipple
@@ -7,14 +7,14 @@
 </div>
 {{#if (has-block)}}
   <div class="md-label">
-    <span id={{labelId}}>
+    <span id={{this.labelId}}>
       {{yield}}
     </span>
   </div>
 {{else}}
   <div class="md-label">
-    <span id={{labelId}}>
-      {{label}}
+    <span id={{this.labelId}}>
+      {{@label}}
     </span>
   </div>
 {{/if}}
diff --git a/addon/components/paper-contact-chips/template.hbs b/addon/components/paper-contact-chips/template.hbs
index 2f6a22a76..628966778 100644
--- a/addon/components/paper-contact-chips/template.hbs
+++ b/addon/components/paper-contact-chips/template.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
 <md-contact-chips class="md-default-theme {{@class}}" ...attributes>
   <PaperChips
     class="md-contact-chips"
@@ -25,9 +24,9 @@
 
     {{#if (eq type "chip")}}
       <div class="md-contact-avatar">
-        <img src={{get item imageField}} alt={{get item nameField}}>
+        <img src={{get item this.imageField}} alt={{get item this.nameField}}>
       </div>
-      <span class="md-contact-name">{{get item nameField}}</span>
+      <span class="md-contact-name">{{get item this.nameField}}</span>
     {{/if}}
 
   </PaperChips>
diff --git a/addon/components/paper-dialog.hbs b/addon/components/paper-dialog.hbs
index a57646227..288562901 100644
--- a/addon/components/paper-dialog.hbs
+++ b/addon/components/paper-dialog.hbs
@@ -1,8 +1,8 @@
-{{! template-lint-disable no-action no-implicit-this }}
-{{#in-element destinationEl insertBefore=null}}
-  <PaperBackdrop @locked-open={{isLockedOpen}} @opaque={{opaque}} @fixed={{unless parent true}} @class="md-dialog-backdrop" @onClick={{action "outsideClicked"}} />
-  <PaperDialogContainer @class={{readonly dialogContainerClass}} @outsideClicked={{action "outsideClicked"}}>
-    <PaperDialogInner @class={{readonly class}} @origin={{origin}} @defaultedParent={{defaultedParent}} @defaultedOpenFrom={{defaultedOpenFrom}} @defaultedCloseTo={{defaultedCloseTo}} @fullscreen={{fullscreen}} @focusOnOpen={{focusOnOpen}}>
+{{! template-lint-disable no-action }}
+{{#in-element this.destinationEl insertBefore=null}}
+  <PaperBackdrop @locked-open={{@isLockedOpen}} @opaque={{this.opaque}} @fixed={{unless @parent true}} @class="md-dialog-backdrop" @onClick={{action "outsideClicked"}} />
+  <PaperDialogContainer @class={{readonly @dialogContainerClass}} @outsideClicked={{action "outsideClicked"}}>
+    <PaperDialogInner @class={{readonly @class}} @origin={{@origin}} @defaultedParent={{this.defaultedParent}} @defaultedOpenFrom={{this.defaultedOpenFrom}} @defaultedCloseTo={{this.defaultedCloseTo}} @fullscreen={{@fullscreen}} @focusOnOpen={{this.focusOnOpen}}>
       {{yield}}
     </PaperDialogInner>
   </PaperDialogContainer>
diff --git a/addon/components/paper-form.hbs b/addon/components/paper-form.hbs
index a779b13a9..7211e91f2 100644
--- a/addon/components/paper-form.hbs
+++ b/addon/components/paper-form.hbs
@@ -1,21 +1,21 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 {{yield (hash
-  isValid=isValid
-  isInvalid=isInvalid
-  isTouched=isTouched
-  isInvalidAndTouched=isInvalidAndTouched
-  input=(component inputComponent
+  isValid=this.isValid
+  isInvalid=this.isInvalid
+  isTouched=this.isTouched
+  isInvalidAndTouched=this.isInvalidAndTouched
+  input=(component this.inputComponent
     parentComponent=this
     onValidityChange=(action "localOnValidityChange")
   )
-  submit-button=(component submitButtonComponent
+  submit-button=(component this.submitButtonComponent
     type="submit"
   )
-  select=(component selectComponent
+  select=(component this.selectComponent
   	parentComponent=this
   	onValidityChange=(action "localOnValidityChange")
   )
-  autocomplete=(component autocompleteComponent
+  autocomplete=(component this.autocompleteComponent
   	parentComponent=this
   	onValidityChange=(action "localOnValidityChange")
   )
diff --git a/addon/components/paper-icon.hbs b/addon/components/paper-icon.hbs
index b463a6d2d..132416f12 100644
--- a/addon/components/paper-icon.hbs
+++ b/addon/components/paper-icon.hbs
@@ -1,3 +1,2 @@
-{{! template-lint-disable no-implicit-this }}
-{{-paper-underscore iconClass}}
+{{-paper-underscore this.iconClass}}
 {{yield}}
diff --git a/addon/components/paper-input.hbs b/addon/components/paper-input.hbs
index 4ed134c4b..2041b50bd 100644
--- a/addon/components/paper-input.hbs
+++ b/addon/components/paper-input.hbs
@@ -1,97 +1,97 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-down-event-binding no-implicit-this no-positive-tabindex }}
-{{#if label}}
-  <label for={{inputElementId}} class={{if required "md-required"}}>{{label}}</label>
+{{! template-lint-disable no-action no-curly-component-invocation no-down-event-binding no-positive-tabindex }}
+{{#if @label}}
+  <label for={{this.inputElementId}} class={{if @required "md-required"}}>{{@label}}</label>
 {{/if}}
 
-{{#if icon}}
-  {{component iconComponent icon}}
+{{#if @icon}}
+  {{component this.iconComponent @icon}}
 {{/if}}
 
-{{#if textarea}}
+{{#if @textarea}}
   <textarea
-    class="md-input {{if isInvalid "ng-invalid"}} {{if isTouched "ng-dirty"}}"
-    id={{inputElementId}}
-    placeholder={{if shouldAddPlaceholder placeholder}}
-    disabled={{disabled}}
-    autofocus={{autofocus}}
-    aria-describedby={{concat elementId "-char-count " elementId "-error-messages"}}
-    onfocus={{onFocus}}
+    class="md-input {{if this.isInvalid "ng-invalid"}} {{if this.isTouched "ng-dirty"}}"
+    id={{this.inputElementId}}
+    placeholder={{if this.shouldAddPlaceholder @placeholder}}
+    disabled={{this.disabled}}
+    autofocus={{this.autofocus}}
+    aria-describedby={{concat this.elementId "-char-count " this.elementId "-error-messages"}}
+    onfocus={{@onFocus}}
     onblur={{action "handleBlur"}}
-    onkeydown={{onKeyDown}}
-    onkeyup={{onKeyUp}}
-    onclick={{onClick}}
+    onkeydown={{@onKeyDown}}
+    onkeyup={{@onKeyUp}}
+    onclick={{@onClick}}
     oninput={{action "handleInput"}}
 
-    name={{passThru.name}}
-    rows={{passThru.rows}}
-    cols={{passThru.cols}}
-    maxlength={{passThru.maxlength}}
-    tabindex={{passThru.tabindex}}
-    title={{title}}
-    required={{passThru.required}}
-    selectionEnd={{passThru.selectionEnd}}
-    selectionStart={{passThru.selectionStart}}
-    selectionDirection={{passThru.selectionDirection}}
-    wrap={{passThru.wrap}}
-    readonly={{passThru.readonly}}
-    form={{passThru.form}}
-    spellcheck={{passThru.spellcheck}}></textarea>
+    name={{@passThru.name}}
+    rows={{@passThru.rows}}
+    cols={{@passThru.cols}}
+    maxlength={{@passThru.maxlength}}
+    tabindex={{@passThru.tabindex}}
+    title={{@title}}
+    required={{@passThru.required}}
+    selectionEnd={{@passThru.selectionEnd}}
+    selectionStart={{@passThru.selectionStart}}
+    selectionDirection={{@passThru.selectionDirection}}
+    wrap={{@passThru.wrap}}
+    readonly={{@passThru.readonly}}
+    form={{@passThru.form}}
+    spellcheck={{@passThru.spellcheck}}></textarea>
 {{else}}
   <input
-    class="md-input {{if isInvalid "ng-invalid"}}  {{if isTouched "ng-dirty"}}"
-    id={{inputElementId}}
-    placeholder={{if shouldAddPlaceholder placeholder}}
-    type={{type}}
-    disabled={{disabled}}
-    autofocus={{autofocus}}
-    aria-describedby={{concat elementId "-char-count " elementId "-error-messages"}}
-    onfocus={{onFocus}}
+    class="md-input {{if this.isInvalid "ng-invalid"}}  {{if this.isTouched "ng-dirty"}}"
+    id={{this.inputElementId}}
+    placeholder={{if this.shouldAddPlaceholder @placeholder}}
+    type={{this.type}}
+    disabled={{this.disabled}}
+    autofocus={{this.autofocus}}
+    aria-describedby={{concat this.elementId "-char-count " this.elementId "-error-messages"}}
+    onfocus={{@onFocus}}
     onblur={{action "handleBlur"}}
-    onkeydown={{onKeyDown}}
-    onkeyup={{onKeyUp}}
-    onclick={{onClick}}
+    onkeydown={{@onKeyDown}}
+    onkeyup={{@onKeyUp}}
+    onclick={{@onClick}}
     oninput={{action "handleInput"}}
 
-    accept={{passThru.accept}}
-    autocomplete={{passThru.autocomplete}}
-    autocorrect={{passThru.autocorrect}}
-    autocapitalize={{passThru.autocapitalize}}
-    autosave={{passThru.autosave}}
-    form={{passThru.form}}
-    formaction={{passThru.formaction}}
-    formenctype={{passThru.formenctype}}
-    formmethod={{passThru.formmethod}}
-    formnovalidate={{passThru.formnovalidate}}
-    formtarget={{passThru.formtarget}}
-    height={{passThru.height}}
-    inputmode={{passThru.inputmode}}
-    min={{passThru.min}}
-    maxlength={{passThru.maxlength}}
-    max={{passThru.max}}
-    multiple={{passThru.multiple}}
-    name={{passThru.name}}
-    pattern={{passThru.pattern}}
-    readonly={{passThru.readonly}}
-    required={{passThru.required}}
-    selectionDirection={{passThru.selectionDirection}}
-    size={{passThru.size}}
-    spellcheck={{passThru.spellcheck}}
-    step={{passThru.step}}
-    tabindex={{passThru.tabindex}}
-    title={{title}}
-    width={{passThru.width}}>
+    accept={{@passThru.accept}}
+    autocomplete={{@passThru.autocomplete}}
+    autocorrect={{@passThru.autocorrect}}
+    autocapitalize={{@passThru.autocapitalize}}
+    autosave={{@passThru.autosave}}
+    form={{@passThru.form}}
+    formaction={{@passThru.formaction}}
+    formenctype={{@passThru.formenctype}}
+    formmethod={{@passThru.formmethod}}
+    formnovalidate={{@passThru.formnovalidate}}
+    formtarget={{@passThru.formtarget}}
+    height={{@passThru.height}}
+    inputmode={{@passThru.inputmode}}
+    min={{@passThru.min}}
+    maxlength={{@passThru.maxlength}}
+    max={{@passThru.max}}
+    multiple={{@passThru.multiple}}
+    name={{@passThru.name}}
+    pattern={{@passThru.pattern}}
+    readonly={{@passThru.readonly}}
+    required={{@passThru.required}}
+    selectionDirection={{@passThru.selectionDirection}}
+    size={{@passThru.size}}
+    spellcheck={{@passThru.spellcheck}}
+    step={{@passThru.step}}
+    tabindex={{@passThru.tabindex}}
+    title={{@title}}
+    width={{@passThru.width}}>
 {{/if}}
 
-{{#unless hideAllMessages}}
-  <div class="md-errors-spacer" id={{concat elementId "-char-count"}}>
-    {{#if maxlength}}
-      <div class="md-char-counter">{{renderCharCount}}</div>
+{{#unless this.hideAllMessages}}
+  <div class="md-errors-spacer" id={{concat this.elementId "-char-count"}}>
+    {{#if @maxlength}}
+      <div class="md-char-counter">{{this.currentLength}}/{{@maxlength}}</div>
     {{/if}}
   </div>
-  {{#if isInvalidAndTouched}}
-    <div class="md-input-messages-animation md-auto-hide" id={{concat elementId "-error-messages"}}>
-      {{#each validationErrorMessages as |error index|}}
-        <div id="error-{{inputElementId}}-{{index}}"
+  {{#if this.isInvalidAndTouched}}
+    <div class="md-input-messages-animation md-auto-hide" id={{concat this.elementId "-error-messages"}}>
+      {{#each this.validationErrorMessages as |error index|}}
+        <div id="error-{{this.inputElementId}}-{{index}}"
         class="paper-input-error ng-enter ng-enter-active md-input-message-animation"
         style="opacity: 1; margin-top: 0">
           {{error.message}}
@@ -102,14 +102,14 @@
 {{/unless}}
 
 {{yield (hash
-  charCount=currentLength
-  isInvalid=isInvalid
-  isTouched=isTouched
-  isInvalidAndTouched=isInvalidAndTouched
-  hasValue=hasValue
-  validationErrorMessages=validationErrorMessages
+  charCount=this.currentLength
+  isInvalid=this.isInvalid
+  isTouched=this.isTouched
+  isInvalidAndTouched=this.isInvalidAndTouched
+  hasValue=this.hasValue
+  validationErrorMessages=this.validationErrorMessages
 )}}
 
-{{#if iconRight}}
-  {{component iconComponent iconRight}}
+{{#if @iconRight}}
+  {{component this.iconComponent @iconRight}}
 {{/if}}
diff --git a/addon/components/paper-input.js b/addon/components/paper-input.js
index c4c8d0587..1d2f97dcd 100644
--- a/addon/components/paper-input.js
+++ b/addon/components/paper-input.js
@@ -76,9 +76,8 @@ export default Component.extend(
       },
     }),
 
-    renderCharCount: computed('value', function () {
-      let currentLength = this.value ? this.value.length : 0;
-      return `${currentLength}/${this.maxlength}`;
+    currentLength: computed('value', function () {
+      return this.value ? this.value.length : 0;
     }),
 
     hasLeftIcon: bool('icon'),
diff --git a/addon/components/paper-item.hbs b/addon/components/paper-item.hbs
index 7e797cdc4..6b9458716 100644
--- a/addon/components/paper-item.hbs
+++ b/addon/components/paper-item.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 {{#with (hash
   checkbox=(component "paper-checkbox" parentComponent=this bubbles=false shouldRegister=true)
   button=(component "paper-button" parentComponent=this bubbles=false shouldRegister=true skipProxy=true)
@@ -6,9 +6,9 @@
   radio=(component "paper-radio-proxiable" parentComponent=this bubbles=false shouldRegister=true)
 ) as |controls|}}
 
-  {{#if hasPrimaryAction}}
+  {{#if this.hasPrimaryAction}}
     <div class="md-button md-no-style">
-      <PaperButton @class="md-no-style" @onClick={{onClick}} @href={{href}} @target={{target}} @onMouseEnter={{action this.handleMouseEnter}} @onMouseLeave={{action this.handleMouseLeave}} />
+      <PaperButton @class="md-no-style" @onClick={{@onClick}} @href={{@href}} @target={{@target}} @onMouseEnter={{action this.handleMouseEnter}} @onMouseLeave={{action this.handleMouseLeave}} />
       <div class="md-list-item-inner">
         {{yield controls}}
       </div>
diff --git a/addon/components/paper-optgroup.hbs b/addon/components/paper-optgroup.hbs
index ed979e762..d55e314cb 100644
--- a/addon/components/paper-optgroup.hbs
+++ b/addon/components/paper-optgroup.hbs
@@ -1,3 +1,3 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
-<label>{{label}}</label>
+{{! template-lint-disable no-curly-component-invocation }}
+<label>{{@label}}</label>
 {{yield}}
\ No newline at end of file
diff --git a/addon/components/paper-progress-circular.hbs b/addon/components/paper-progress-circular.hbs
index ba47b774e..1ea117beb 100644
--- a/addon/components/paper-progress-circular.hbs
+++ b/addon/components/paper-progress-circular.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 {{diameter}} {{diameter}}" style={{svgStyle}}>
-  <path fill="none" style={{pathStyle}} stroke-dasharray={{strokeDasharray}} d={{d}}></path>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 {{this.diameter}} {{this.diameter}}" style={{this.svgStyle}}>
+  <path fill="none" style={{this.pathStyle}} stroke-dasharray={{this.strokeDasharray}} d={{this.d}}></path>
 </svg>
\ No newline at end of file
diff --git a/addon/components/paper-progress-linear.hbs b/addon/components/paper-progress-linear.hbs
index 91bec9c31..29c14b4f4 100644
--- a/addon/components/paper-progress-linear.hbs
+++ b/addon/components/paper-progress-linear.hbs
@@ -1,6 +1,5 @@
-{{! template-lint-disable no-implicit-this }}
-<div class="md-container {{queryModeClass}}">
+<div class="md-container {{this.queryModeClass}}">
   <div class="md-dashed"></div>
-  <div class="md-bar md-bar1" style={{bar1Style}}></div>
-  <div class="md-bar md-bar2" style={{bar2Style}}></div>
+  <div class="md-bar md-bar1" style={{this.bar1Style}}></div>
+  <div class="md-bar md-bar2" style={{this.bar2Style}}></div>
 </div>
diff --git a/addon/components/paper-radio-base.hbs b/addon/components/paper-radio-base.hbs
index 33a6751bf..46afc79ee 100644
--- a/addon/components/paper-radio-base.hbs
+++ b/addon/components/paper-radio-base.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 <div class="md-container">
   <div class="md-off"></div>
   <div class="md-on"></div>
@@ -15,7 +15,7 @@
 {{else}}
   <div class="md-label">
     <span>
-      {{label}}
+      {{@label}}
     </span>
   </div>
 {{/if}}
diff --git a/addon/components/paper-radio-group-label.hbs b/addon/components/paper-radio-group-label.hbs
index c5de95f60..7dea1d339 100644
--- a/addon/components/paper-radio-group-label.hbs
+++ b/addon/components/paper-radio-group-label.hbs
@@ -1,7 +1,7 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 {{#if (has-block)}}
   {{yield}}
 {{else}}
-  {{text}}
+  {{@text}}
 {{/if}}
 
diff --git a/addon/components/paper-radio-group.hbs b/addon/components/paper-radio-group.hbs
index 7f6aada97..0d700809c 100644
--- a/addon/components/paper-radio-group.hbs
+++ b/addon/components/paper-radio-group.hbs
@@ -1,12 +1,12 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 {{yield (hash
-  label=(component labelComponent
-    setAriaLabelledby=(action (mut ariaLabelledby))
+  label=(component this.labelComponent
+    setAriaLabelledby=(action (mut this.ariaLabelledby))
   )
-  radio=(component radioComponent
-    toggle=toggle
-    disabled=disabled
-    groupValue=groupValue
+  radio=(component this.radioComponent
+    toggle=this.toggle
+    disabled=this.disabled
+    groupValue=@groupValue
     onChange=(action "onChange")
     parentComponent=this
     shouldRegister=true)
diff --git a/addon/components/paper-sidenav-toggle.hbs b/addon/components/paper-sidenav-toggle.hbs
index 788f02acb..ac354e36e 100644
--- a/addon/components/paper-sidenav-toggle.hbs
+++ b/addon/components/paper-sidenav-toggle.hbs
@@ -1,2 +1,2 @@
-{{! template-lint-disable no-action no-implicit-this }}
-{{yield (action toggle)}}
\ No newline at end of file
+{{! template-lint-disable no-action }}
+{{yield (action this.toggle)}}
\ No newline at end of file
diff --git a/addon/components/paper-sidenav.hbs b/addon/components/paper-sidenav.hbs
index 9fafa7eff..0faf8335a 100644
--- a/addon/components/paper-sidenav.hbs
+++ b/addon/components/paper-sidenav.hbs
@@ -1,15 +1,15 @@
-{{! template-lint-disable no-action no-implicit-this }}
-{{#unless closed}}
+{{! template-lint-disable no-action }}
+{{#unless this.closed}}
   <PaperBackdrop @opaque={{true}} @class="md-sidenav-backdrop" @onClick={{action "onBackdropTap"}} />
 {{/unless}}
 
 <PaperSidenavInner
-  @class={{class}}
-  @name={{name}}
-  @position={{position}}
-  @lockedOpen={{lockedOpen}}
-  @closed={{closed}}
-  @closeOnClick={{closeOnClick}}
+  @class={{@class}}
+  @name={{this.name}}
+  @position={{this.position}}
+  @lockedOpen={{this.lockedOpen}}
+  @closed={{this.closed}}
+  @closeOnClick={{this.closeOnClick}}
   @onToggle={{action "onToggle"}}
   ...attributes>
   {{yield}}
diff --git a/addon/components/paper-speed-dial-actions.hbs b/addon/components/paper-speed-dial-actions.hbs
index 9df0043dc..9ce8dd959 100644
--- a/addon/components/paper-speed-dial-actions.hbs
+++ b/addon/components/paper-speed-dial-actions.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
 {{yield (hash
-  action=(component "paper-speed-dial-actions-action" speedDial=speedDial)
+  action=(component "paper-speed-dial-actions-action" speedDial=@speedDial)
 )}}
\ No newline at end of file
diff --git a/addon/components/paper-switch.hbs b/addon/components/paper-switch.hbs
index 52c4ebe32..461fc73e0 100644
--- a/addon/components/paper-switch.hbs
+++ b/addon/components/paper-switch.hbs
@@ -1,8 +1,8 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 <div class="md-switch-bar"></div>
 <div class="md-container">
   <div class="md-bar"></div>
-  <div class="md-thumb-container" style={{thumbContainerStyle}}>
+  <div class="md-thumb-container" style={{this.thumbContainerStyle}}>
     <div class="md-thumb">
       <PaperRipple @center={{true}} @fitRipple={{true}}/>
     </div>
@@ -14,6 +14,6 @@
   </div>
 {{else}}
   <div class="md-label">
-    {{label}}
+    {{@label}}
   </div>
 {{/if}}
diff --git a/addon/components/paper-tab.hbs b/addon/components/paper-tab.hbs
index 8021a2a57..f5007a8b9 100644
--- a/addon/components/paper-tab.hbs
+++ b/addon/components/paper-tab.hbs
@@ -1,7 +1,7 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 {{#if (has-block)}}
   {{yield}}
 {{else}}
-  {{name}}
+  {{@name}}
 {{/if}}
 <PaperRipple/>
\ No newline at end of file
diff --git a/addon/components/paper-tabs.hbs b/addon/components/paper-tabs.hbs
index cf2d7c442..5df13b113 100644
--- a/addon/components/paper-tabs.hbs
+++ b/addon/components/paper-tabs.hbs
@@ -1,28 +1,28 @@
-{{! template-lint-disable no-action no-implicit-this }}
-<md-tabs-wrapper class={{if shouldStretch "md-stretch-tabs"}}>
+{{! template-lint-disable no-action }}
+<md-tabs-wrapper class={{if this.shouldStretch "md-stretch-tabs"}}>
 
-  {{#if shouldPaginate}}
-    <md-prev-button role="button" class={{unless canPageBack "md-disabled"}} onclick={{action "previousPage"}}>
+  {{#if this.shouldPaginate}}
+    <md-prev-button role="button" class={{unless this.canPageBack "md-disabled"}} onclick={{action "previousPage"}}>
       {{paper-icon "keyboard-arrow-left"}}
     </md-prev-button>
-    <md-next-button role="button" class={{unless canPageForward "md-disabled"}} onclick={{action "nextPage"}}>
+    <md-next-button role="button" class={{unless this.canPageForward "md-disabled"}} onclick={{action "nextPage"}}>
       {{paper-icon "keyboard-arrow-left"}}
     </md-next-button>
   {{/if}}
 
-  <md-tabs-canvas class="{{if shouldPaginate "md-paginated"}} {{if shouldCenter "md-center-tabs"}}" tabindex="-1" role="tablist">
-    <md-pagination-wrapper class={{if shouldCenter "md-center-tabs"}} style={{if shouldPaginate paginationStyle}}>
+  <md-tabs-canvas class="{{if this.shouldPaginate "md-paginated"}}{{if this.shouldCenter "md-center-tabs"}}" tabindex="-1" role="tablist">
+    <md-pagination-wrapper class={{if this.shouldCenter "md-center-tabs"}} style={{if this.shouldPaginate this.paginationStyle}}>
 
       {{yield (hash
         tab=(component "paper-tab"
-          noInk=noInk
-          selected=selected
+          noInk=this.noInk
+          selected=this.selected
           onSelect=(action "localOnChange")
         )
       )}}
 
-      {{#if inkBar}}
-        <PaperInkBar @movingRight={{movingRight}} @left={{inkBar.left}} @right={{inkBar.right}} />
+      {{#if this.inkBar}}
+        <PaperInkBar @movingRight={{this.movingRight}} @left={{this.inkBar.left}} @right={{this.inkBar.right}} />
       {{/if}}
 
     </md-pagination-wrapper>
diff --git a/addon/components/paper-toast.hbs b/addon/components/paper-toast.hbs
index f6ab59c44..8c9bd9208 100644
--- a/addon/components/paper-toast.hbs
+++ b/addon/components/paper-toast.hbs
@@ -1,6 +1,5 @@
-{{! template-lint-disable no-implicit-this }}
-{{#in-element destinationEl insertBefore=null}}
-  <PaperToastInner @swipeToClose={{swipeToClose}} @onClose={{onClose}} @top={{top}} @left={{left}} @capsule={{capsule}} @class={{class}}>
+{{#in-element this.destinationEl insertBefore=null}}
+  <PaperToastInner @swipeToClose={{this.swipeToClose}} @onClose={{@onClose}} @top={{this.top}} @left={{this.left}} @capsule={{this.capsule}} @class={{@class}}>
     {{yield (hash
       text=(component "paper-toast-text")
     )}}
diff --git a/addon/components/paper-toaster.hbs b/addon/components/paper-toaster.hbs
index b32cce8e1..411208f71 100644
--- a/addon/components/paper-toaster.hbs
+++ b/addon/components/paper-toaster.hbs
@@ -1,14 +1,14 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 {{yield}}
-{{#if activeToast.show}}
-  <PaperToast @onClose={{action onClose activeToast}} @position={{activeToast.position}} @duration={{activeToast.duration}} @class={{activeToast.toastClass}} @parent={{parent}} as |toast|>
-    {{#if activeToast.componentName}}
-      {{component activeToast.componentName}}
+{{#if this.activeToast.show}}
+  <PaperToast @onClose={{action this.onClose this.activeToast}} @position={{this.activeToast.position}} @duration={{this.activeToast.duration}} @class={{this.activeToast.toastClass}} @parent={{@parent}} as |toast|>
+    {{#if this.activeToast.componentName}}
+      {{component this.activeToast.componentName}}
     {{else}}
-      <toast.text>{{activeToast.text}}</toast.text>
-      {{#if activeToast.action}}
-        <PaperButton @primary={{activeToast.action.primary}} @accent={{activeToast.action.accent}} @warn={{activeToast.action.warn}} @onClick={{activeToast.action.onClick}}>
-          {{activeToast.action.label}}
+      <toast.text>{{this.activeToast.text}}</toast.text>
+      {{#if this.activeToast.action}}
+        <PaperButton @primary={{this.activeToast.action.primary}} @accent={{this.activeToast.action.accent}} @warn={{this.activeToast.action.warn}} @onClick={{this.activeToast.action.onClick}}>
+          {{this.activeToast.action.label}}
         </PaperButton>
       {{/if}}
     {{/if}}
diff --git a/addon/components/paper-tooltip.hbs b/addon/components/paper-tooltip.hbs
index 624fdba56..c05c6cfb0 100644
--- a/addon/components/paper-tooltip.hbs
+++ b/addon/components/paper-tooltip.hbs
@@ -1,8 +1,7 @@
-{{! template-lint-disable no-implicit-this }}
-{{#if renderTooltip}}
-  {{#in-element destinationEl insertBefore=null}}
-    <div class="md-panel-outer-wrapper md-panel-is-showing" style={{containerStyle}}>
-      <PaperTooltipInner @class={{class}} @position={{position}} @anchorElement={{anchorElement}} @hide={{hideTooltip}} ...attributes>
+{{#if this.renderTooltip}}
+  {{#in-element this.destinationEl insertBefore=null}}
+    <div class="md-panel-outer-wrapper md-panel-is-showing" style={{this.containerStyle}}>
+      <PaperTooltipInner @class={{@class}} @position={{this.position}} @anchorElement={{this.anchorElement}} @hide={{this.hideTooltip}} ...attributes>
         {{yield}}
       </PaperTooltipInner>
     </div>
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index 2a2824e95..ee405d002 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -1,6 +1,6 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PaperSidenavContainer @class="site-nav-container">
-  <PaperSidenav @class="md-whiteframe-z2 site-sidenav" @lockedOpen="gt-sm" @open={{isSidenavOpen}} @onToggle={{action (mut isSidenavOpen)}}>
+  <PaperSidenav @class="md-whiteframe-z2 site-sidenav" @lockedOpen="gt-sm" @open={{this.isSidenavOpen}} @onToggle={{action (mut this.isSidenavOpen)}}>
     <PaperToolbar @class="site-content-toolbar" @tall={{true}}>
       <div class="logo layout-column layout-align-center-center">
         <img alt="ember" src="/ember-logo-white.png">
@@ -11,54 +11,54 @@
     <PaperContent>
 
       <PaperList>
-        <MenuItem @active={{is-active "index" currentRouteName}} @href={{href-to "index"}}>Introduction</MenuItem>
+        <MenuItem @active={{is-active "index" this.currentRouteName}} @href={{href-to "index"}}>Introduction</MenuItem>
 
-        <MenuItem @onClick={{action "toggleExpandedItem" "demos"}} @expanded={{demosExpanded}} @canExpand={{true}}>Components</MenuItem>
+        <MenuItem @onClick={{action "toggleExpandedItem" "demos"}} @expanded={{this.demosExpanded}} @canExpand={{true}}>Components</MenuItem>
 
         <div class="submenu">
-          {{#liquid-if demosExpanded}}
-            <SubmenuItem @active={{is-active "demo.autocomplete" currentRouteName}} @href={{href-to "demo.autocomplete"}}>Autocomplete</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.button" currentRouteName}} @href={{href-to "demo.button"}}>Button</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.card" currentRouteName}} @href={{href-to "demo.card"}}>Card</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.checkbox" currentRouteName}} @href={{href-to "demo.checkbox"}}>Checkbox</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.chips" currentRouteName}} @href={{href-to "demo.chips"}}>Chips</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.dialog" currentRouteName}} @href={{href-to "demo.dialog"}}>Dialog</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.divider" currentRouteName}} @href={{href-to "demo.divider"}}>Divider</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.grid-list" currentRouteName}} @href={{href-to "demo.grid-list"}}>Grid List</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.icons" currentRouteName}} @href={{href-to "demo.icons"}}>Icons</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.input" currentRouteName}} @href={{href-to "demo.input"}}>Input</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.list" currentRouteName}} @href={{href-to "demo.list"}}>List</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.menu" currentRouteName}} @href={{href-to "demo.menu"}}>Menu</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.progress-circular" currentRouteName}} @href={{href-to "demo.progress-circular"}}>Progress Circular</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.progress-linear" currentRouteName}} @href={{href-to "demo.progress-linear"}}>Progress Linear</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.radio" currentRouteName}} @href={{href-to "demo.radio"}}>Radio</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.select" currentRouteName}} @href={{href-to "demo.select"}}>Select</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.sidenav" currentRouteName}} @href={{href-to "demo.sidenav"}}>Sidenav</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.slider" currentRouteName}} @href={{href-to "demo.slider"}}>Slider</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.speed-dial" currentRouteName}} @href={{href-to "demo.speed-dial"}}>Speed Dial</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.switch" currentRouteName}} @href={{href-to "demo.switch"}}>Switch</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.tabs.index" currentRouteName}} @href={{href-to "demo.tabs"}}>Tabs</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.toast" currentRouteName}} @href={{href-to "demo.toast"}}>Toast</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.toolbar" currentRouteName}} @href={{href-to "demo.toolbar"}}>Toolbar</SubmenuItem>
-            <SubmenuItem @active={{is-active "demo.tooltip" currentRouteName}} @href={{href-to "demo.tooltip"}}>Tooltip</SubmenuItem>
+          {{#liquid-if this.demosExpanded}}
+            <SubmenuItem @active={{is-active "demo.autocomplete" this.currentRouteName}} @href={{href-to "demo.autocomplete"}}>Autocomplete</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.button" this.currentRouteName}} @href={{href-to "demo.button"}}>Button</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.card" this.currentRouteName}} @href={{href-to "demo.card"}}>Card</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.checkbox" this.currentRouteName}} @href={{href-to "demo.checkbox"}}>Checkbox</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.chips" this.currentRouteName}} @href={{href-to "demo.chips"}}>Chips</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.dialog" this.currentRouteName}} @href={{href-to "demo.dialog"}}>Dialog</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.divider" this.currentRouteName}} @href={{href-to "demo.divider"}}>Divider</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.grid-list" this.currentRouteName}} @href={{href-to "demo.grid-list"}}>Grid List</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.icons" this.currentRouteName}} @href={{href-to "demo.icons"}}>Icons</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.input" this.currentRouteName}} @href={{href-to "demo.input"}}>Input</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.list" this.currentRouteName}} @href={{href-to "demo.list"}}>List</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.menu" this.currentRouteName}} @href={{href-to "demo.menu"}}>Menu</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.progress-circular" this.currentRouteName}} @href={{href-to "demo.progress-circular"}}>Progress Circular</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.progress-linear" this.currentRouteName}} @href={{href-to "demo.progress-linear"}}>Progress Linear</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.radio" this.currentRouteName}} @href={{href-to "demo.radio"}}>Radio</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.select" this.currentRouteName}} @href={{href-to "demo.select"}}>Select</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.sidenav" this.currentRouteName}} @href={{href-to "demo.sidenav"}}>Sidenav</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.slider" this.currentRouteName}} @href={{href-to "demo.slider"}}>Slider</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.speed-dial" this.currentRouteName}} @href={{href-to "demo.speed-dial"}}>Speed Dial</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.switch" this.currentRouteName}} @href={{href-to "demo.switch"}}>Switch</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.tabs.index" this.currentRouteName}} @href={{href-to "demo.tabs"}}>Tabs</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.toast" this.currentRouteName}} @href={{href-to "demo.toast"}}>Toast</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.toolbar" this.currentRouteName}} @href={{href-to "demo.toolbar"}}>Toolbar</SubmenuItem>
+            <SubmenuItem @active={{is-active "demo.tooltip" this.currentRouteName}} @href={{href-to "demo.tooltip"}}>Tooltip</SubmenuItem>
           {{/liquid-if}}
         </div>
-        <MenuItem @active={{is-active "forms" currentRouteName}} @href={{href-to "forms"}}>Forms</MenuItem>
-        <MenuItem @active={{is-active "typography" currentRouteName}} @href={{href-to "typography"}}>Typography</MenuItem>
-        <MenuItem @active={{is-active "theme" currentRouteName}} @href={{href-to "theme"}}>Color & Theme</MenuItem>
+        <MenuItem @active={{is-active "forms" this.currentRouteName}} @href={{href-to "forms"}}>Forms</MenuItem>
+        <MenuItem @active={{is-active "typography" this.currentRouteName}} @href={{href-to "typography"}}>Typography</MenuItem>
+        <MenuItem @active={{is-active "theme" this.currentRouteName}} @href={{href-to "theme"}}>Color & Theme</MenuItem>
 
-        <MenuItem @onClick={{action "toggleExpandedItem" "layout"}} @expanded={{layoutExpanded}} @canExpand={{true}}>Layout</MenuItem>
+        <MenuItem @onClick={{action "toggleExpandedItem" "layout"}} @expanded={{this.layoutExpanded}} @canExpand={{true}}>Layout</MenuItem>
         <div class="submenu">
-          {{#liquid-if layoutExpanded}}
-            <SubmenuItem @active={{is-active "layout.introduction" currentRouteName}} @href={{href-to "layout.introduction"}}>Introduction</SubmenuItem>
-            <SubmenuItem @active={{is-active "layout.layout-containers" currentRouteName}} @href={{href-to "layout.layout-containers"}}>Layout Containers</SubmenuItem>
-            <SubmenuItem @active={{is-active "layout.layout-children" currentRouteName}} @href={{href-to "layout.layout-children"}}>Layout Children</SubmenuItem>
-            <SubmenuItem @active={{is-active "layout.child-alignment" currentRouteName}} @href={{href-to "layout.child-alignment"}}>Child Alignment</SubmenuItem>
+          {{#liquid-if this.layoutExpanded}}
+            <SubmenuItem @active={{is-active "layout.introduction" this.currentRouteName}} @href={{href-to "layout.introduction"}}>Introduction</SubmenuItem>
+            <SubmenuItem @active={{is-active "layout.layout-containers" this.currentRouteName}} @href={{href-to "layout.layout-containers"}}>Layout Containers</SubmenuItem>
+            <SubmenuItem @active={{is-active "layout.layout-children" this.currentRouteName}} @href={{href-to "layout.layout-children"}}>Layout Children</SubmenuItem>
+            <SubmenuItem @active={{is-active "layout.child-alignment" this.currentRouteName}} @href={{href-to "layout.child-alignment"}}>Child Alignment</SubmenuItem>
           {{/liquid-if}}
         </div>
 
-        <MenuItem @active={{is-active "cookbook" currentRouteName}} @href={{href-to "cookbook"}}>Cookbook</MenuItem>
-        <MenuItem @active={{is-active "addons" currentRouteName}} @href={{href-to "addons"}}>Addons</MenuItem>
+        <MenuItem @active={{is-active "cookbook" this.currentRouteName}} @href={{href-to "cookbook"}}>Cookbook</MenuItem>
+        <MenuItem @active={{is-active "addons" this.currentRouteName}} @href={{href-to "addons"}}>Addons</MenuItem>
       </PaperList>
 
     </PaperContent>
diff --git a/tests/dummy/app/templates/components/doc-content.hbs b/tests/dummy/app/templates/components/doc-content.hbs
index 5c9ce3e98..05b0c455e 100644
--- a/tests/dummy/app/templates/components/doc-content.hbs
+++ b/tests/dummy/app/templates/components/doc-content.hbs
@@ -1,6 +1,5 @@
-{{! template-lint-disable no-implicit-this }}
 <PaperContent @class="md-padding">
-  <div class="doc-content {{class}}">
+  <div class="doc-content {{@class}}">
     {{yield}}
   </div>
 </PaperContent>
\ No newline at end of file
diff --git a/tests/dummy/app/templates/components/example-item.hbs b/tests/dummy/app/templates/components/example-item.hbs
index 930b3e879..569c8d8c8 100644
--- a/tests/dummy/app/templates/components/example-item.hbs
+++ b/tests/dummy/app/templates/components/example-item.hbs
@@ -1,8 +1,8 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 {{! BEGIN-SNIPPET autocomplete.example-item }}
 {{! app/templates/components/example-item.hbs }}
 <span class="item-title">
   {{paper-icon "star"}}
-  <span><PaperAutocompleteHighlight @searchText={{searchText}} @label={{item}} /> (index {{index}} )</span>
+  <span><PaperAutocompleteHighlight @searchText={{@searchText}} @label={{@item}} /> (index {{@index}} )</span>
 </span>
 {{! END-SNIPPET }}
diff --git a/tests/dummy/app/templates/components/menu-item.hbs b/tests/dummy/app/templates/components/menu-item.hbs
index a05c510c8..1df3adb06 100644
--- a/tests/dummy/app/templates/components/menu-item.hbs
+++ b/tests/dummy/app/templates/components/menu-item.hbs
@@ -1,7 +1,6 @@
-{{! template-lint-disable no-implicit-this }}
-<PaperItem @onClick={{onClick}} @href={{href}} @class={{concat "menu-item" (if active " active") (if expanded " expanded")}}>
+<PaperItem @onClick={{@onClick}} @href={{@href}} @class={{concat "menu-item" (if @active " active") (if @expanded " expanded")}}>
   {{yield}}
-  {{#if canExpand}}
+  {{#if @canExpand}}
     {{paper-icon "expand-more" class="expand-icon"}}
   {{/if}}
 </PaperItem>
\ No newline at end of file
diff --git a/tests/dummy/app/templates/components/not-found.hbs b/tests/dummy/app/templates/components/not-found.hbs
index a7df4640d..88d8a38f7 100644
--- a/tests/dummy/app/templates/components/not-found.hbs
+++ b/tests/dummy/app/templates/components/not-found.hbs
@@ -1,5 +1,5 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-curly-component-invocation }}
 {{! BEGIN-SNIPPET autocomplete.not-found }}
 {{! app/templates/components/not-found.hbs }}
-Whoops! Could not find "{{searchText}}".
+Whoops! Could not find "{{@searchText}}".
 {{! END-SNIPPET }}
diff --git a/tests/dummy/app/templates/components/page-toolbar.hbs b/tests/dummy/app/templates/components/page-toolbar.hbs
index 86f5f6fc7..4cc84a3d8 100644
--- a/tests/dummy/app/templates/components/page-toolbar.hbs
+++ b/tests/dummy/app/templates/components/page-toolbar.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable link-rel-noopener no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable link-rel-noopener no-action no-curly-component-invocation }}
 <PaperToolbar @class="md-whiteframe-1dp page-main-toolbar" as |toolbar|>
   <toolbar.tools>
     <PaperSidenavToggle as |toggleAction|>
@@ -8,13 +8,13 @@
     </PaperSidenavToggle>
     <div class="layout-row flex">
       <h2>
-        {{#if isDemo}}
+        {{#if @isDemo}}
           Components {{paper-icon "chevron-right"}}
-        {{else if isLayout}}
+        {{else if @isLayout}}
           Layout {{paper-icon "chevron-right"}}
         {{/if}}
-        {{pageTitle}}
-        {{#if isWIP}}
+        {{@pageTitle}}
+        {{#if @isWIP}}
           {{paper-icon "warning" title="Not updated yet."}}
         {{/if}}
       </h2>
diff --git a/tests/dummy/app/templates/components/paper-api.hbs b/tests/dummy/app/templates/components/paper-api.hbs
index 2e6db5ad9..998d1557c 100644
--- a/tests/dummy/app/templates/components/paper-api.hbs
+++ b/tests/dummy/app/templates/components/paper-api.hbs
@@ -1,22 +1,22 @@
-{{! template-lint-disable no-curly-component-invocation no-implicit-this }}
-{{#if title}}
-  <h3>{{title}}</h3>
+{{! template-lint-disable no-curly-component-invocation }}
+{{#if this.title}}
+  <h3>{{this.title}}</h3>
 {{/if}}
 
 {{yield}}
 <div class="table-wrapper">
   {{! template-lint-disable table-groups }}
   <table class="paper-api">
-    {{#if header}}
+    {{#if this.header}}
       <thead>
         <tr>
-          {{#each header as |heading|}}
+          {{#each this.header as |heading|}}
             <th>{{heading}}</th>
           {{/each}}
         </tr>
       </thead>
     {{/if}}
-    {{#each categories as |category|}}
+    {{#each this.categories as |category|}}
       <tbody>
         {{#each category as |row|}}
           {{#if (is-subheading row)}}
diff --git a/tests/dummy/app/templates/components/submenu-item.hbs b/tests/dummy/app/templates/components/submenu-item.hbs
index baf3b6498..44c186652 100644
--- a/tests/dummy/app/templates/components/submenu-item.hbs
+++ b/tests/dummy/app/templates/components/submenu-item.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
-<PaperItem @onClick={{onClick}} @href={{href}} @class={{concat "submenu-item" (if active " active")}}>
+<PaperItem @onClick={{@onClick}} @href={{@href}} @class={{concat "submenu-item" (if @active " active")}}>
   {{yield}}
 </PaperItem>
\ No newline at end of file
diff --git a/tests/dummy/app/templates/demo/autocomplete.hbs b/tests/dummy/app/templates/demo/autocomplete.hbs
index ebb57a335..f64242f15 100644
--- a/tests/dummy/app/templates/demo/autocomplete.hbs
+++ b/tests/dummy/app/templates/demo/autocomplete.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-duplicate-landmark-elements no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation no-duplicate-landmark-elements }}
 <PageToolbar @pageTitle="Autocomplete" @isDemo={{true}} />
 
 <DocContent>
@@ -9,34 +9,34 @@
       <blockquote>Use <code>\{{paper-autocomplete}}</code> to search for matches from local or remote data sources.</blockquote>
       <form>
         {{! BEGIN-SNIPPET autocomplete.basic-usage }}
-        <PaperAutocomplete @disabled={{firstDisabled}} @onCreate={{action "addCountry"}} @options={{items}} @allowClear={{true}} @defaultHighlighted={{if enableDefaultHighlighted highlightFirstMatch}} @searchText={{readonly countrySearchText}} @onSearchTextChange={{action (mut countrySearchText)}} @selected={{selectedCountry}} @search={{if simulateQuery (action "searchCountries")}} @searchField="name" @labelPath="name" @placeholder="Select a Country..." @noMatchesMessage="Oops this country doesn't exist. Create a new country?" @onSelectionChange={{action (mut selectedCountry)}} />
+        <PaperAutocomplete @disabled={{this.firstDisabled}} @onCreate={{action "addCountry"}} @options={{this.items}} @allowClear={{true}} @defaultHighlighted={{if this.enableDefaultHighlighted this.highlightFirstMatch}} @searchText={{readonly this.countrySearchText}} @onSearchTextChange={{action (mut this.countrySearchText)}} @selected={{this.selectedCountry}} @search={{if this.simulateQuery (action "searchCountries")}} @searchField="name" @labelPath="name" @placeholder="Select a Country..." @noMatchesMessage="Oops this country doesn't exist. Create a new country?" @onSelectionChange={{action (mut this.selectedCountry)}} />
         {{! END-SNIPPET }}
       </form>
       <p>
-        {{#if selectedCountry}}
-          Selected country is {{selectedCountry.name}} ({{selectedCountry.code}})
+        {{#if this.selectedCountry}}
+          Selected country is {{this.selectedCountry.name}} ({{this.selectedCountry.code}})
         {{else}}
           Nothing selected...
         {{/if}}
       </p>
       <p>
-        {{#if countrySearchText}}
-          Search text is {{countrySearchText}}
+        {{#if this.countrySearchText}}
+          Search text is {{this.countrySearchText}}
         {{else}}
           No search text
         {{/if}}
       </p>
-      <PaperCheckbox @value={{firstDisabled}} @onChange={{action (mut firstDisabled)}}>
+      <PaperCheckbox @value={{this.firstDisabled}} @onChange={{action (mut this.firstDisabled)}}>
         Disable input
       </PaperCheckbox>
-      <PaperCheckbox @value={{simulateQuery}} @onChange={{action (mut simulateQuery)}}>
+      <PaperCheckbox @value={{this.simulateQuery}} @onChange={{action (mut this.simulateQuery)}}>
         Simulate query
       </PaperCheckbox>
-      <PaperCheckbox @value={{enableDefaultHighlighted}} @onChange={{action (mut enableDefaultHighlighted)}}>
+      <PaperCheckbox @value={{this.enableDefaultHighlighted}} @onChange={{action (mut this.enableDefaultHighlighted)}}>
         Highlight first match
       </PaperCheckbox>
-      <PaperButton @primary={{true}} @label="Reset search-Text" @onClick={{action (mut countrySearchText) ""}} />
-      <PaperButton @primary={{true}} @label="Reset selected" @onClick={{action (mut selectedCountry) null}} />
+      <PaperButton @primary={{true}} @label="Reset search-Text" @onClick={{action (mut this.countrySearchText) ""}} />
+      <PaperButton @primary={{true}} @label="Reset selected" @onClick={{action (mut this.selectedCountry) null}} />
 
       <h3>Template</h3>
       <CodeSnippet @name="autocomplete.basic-usage.hbs" />
@@ -55,9 +55,9 @@
         {{! BEGIN-SNIPPET autocomplete.block-custom-template }}
         {{#paper-autocomplete
           placeholder="Type e.g. ember, paper, one, two etc."
-          options=arrayOfItems
-          selected=selectedItem
-          onSelectionChange=(action (mut selectedItem))
+          options=this.arrayOfItems
+          selected=this.selectedItem
+          onSelectionChange=(action (mut this.selectedItem))
           as |item term|}}
           <span class="item-title">
             {{paper-icon "star"}}
@@ -72,7 +72,7 @@
       </form>
 
       <p>
-        Selected: {{if selectedItem selectedItem "None"}}
+        Selected: {{if this.selectedItem this.selectedItem "None"}}
       </p>
 
       <h3>Template</h3>
@@ -86,30 +86,30 @@
       <blockquote>The following example demonstrates floating labels being used as a normal form element.</blockquote>
       <form class="layout-row">
         {{! BEGIN-SNIPPET autocomplete.floating-label }}
-        <PaperInput @label="Name" @value={{name}} @onChange={{action (mut name)}} @class="flex" />
-        <PaperAutocomplete @disabled={{readonly disabled2}} @required={{readonly isRequired}} @triggerClass="flex" @options={{items}} @selected={{selectedCountry2}} @search={{if simulateQuery2 (action "searchCountries")}} @searchField="name" @labelPath="name" @label="Select a Country..." @allowClear={{readonly allowClearWithLabel}} @noMatchesMessage="Oops this country doesn't exist." @onSelectionChange={{action (mut selectedCountry2)}} as |country select|>
+        <PaperInput @label="Name" @value={{this.name}} @onChange={{action (mut this.name)}} @class="flex" />
+        <PaperAutocomplete @disabled={{readonly this.disabled2}} @required={{readonly this.isRequired}} @triggerClass="flex" @options={{this.items}} @selected={{this.selectedCountry2}} @search={{if this.simulateQuery2 (action "searchCountries")}} @searchField="name" @labelPath="name" @label="Select a Country..." @allowClear={{readonly this.allowClearWithLabel}} @noMatchesMessage="Oops this country doesn't exist." @onSelectionChange={{action (mut this.selectedCountry2)}} as |country select|>
           <PaperAutocompleteHighlight @label={{country.name}} @searchText={{select.searchText}} @flags="i" />
         </PaperAutocomplete>
 
         {{! END-SNIPPET }}
       </form>
       <p>
-        {{#if selectedCountry2}}
-          Selected country is {{selectedCountry2.name}} ({{selectedCountry2.code}})
+        {{#if this.selectedCountry2}}
+          Selected country is {{this.selectedCountry2.name}} ({{this.selectedCountry2.code}})
         {{else}}
           Nothing is selected.
         {{/if}}
       </p>
-      <PaperCheckbox @value={{readonly disabled2}} @onChange={{action (mut disabled2)}}>
+      <PaperCheckbox @value={{readonly this.disabled2}} @onChange={{action (mut this.disabled2)}}>
         Disable input
       </PaperCheckbox>
-      <PaperCheckbox @value={{readonly simulateQuery2}} @onChange={{action (mut simulateQuery2)}}>
+      <PaperCheckbox @value={{readonly this.simulateQuery2}} @onChange={{action (mut this.simulateQuery2)}}>
         Simulate query
       </PaperCheckbox>
-      <PaperCheckbox @value={{isRequired}} @onChange={{action (mut isRequired)}}>
+      <PaperCheckbox @value={{this.isRequired}} @onChange={{action (mut this.isRequired)}}>
         Is required
       </PaperCheckbox>
-      <PaperCheckbox @value={{readonly allowClearWithLabel}} @onChange={{action (mut allowClearWithLabel)}}>
+      <PaperCheckbox @value={{readonly this.allowClearWithLabel}} @onChange={{action (mut this.allowClearWithLabel)}}>
         Allow Clear
       </PaperCheckbox>
 
diff --git a/tests/dummy/app/templates/demo/checkbox.hbs b/tests/dummy/app/templates/demo/checkbox.hbs
index 947dd7122..b206312eb 100644
--- a/tests/dummy/app/templates/demo/checkbox.hbs
+++ b/tests/dummy/app/templates/demo/checkbox.hbs
@@ -1,36 +1,36 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Checkbox" @isDemo={{true}} />
 
 <DocContent>
   {{! BEGIN-SNIPPET checkbox }}
   <div class="layout-column">
-    <PaperCheckbox @value={{value1}} @onChange={{action (mut value1)}}>
-      A checkbox: {{value1}}
+    <PaperCheckbox @value={{this.value1}} @onChange={{action (mut this.value1)}}>
+      A checkbox: {{this.value1}}
     </PaperCheckbox>
 
-    <PaperCheckbox @value={{value2}} @onChange={{action (mut value2)}}>
-      A checkbox: {{if value2 "yep" "nope"}}
+    <PaperCheckbox @value={{this.value2}} @onChange={{action (mut this.value2)}}>
+      A checkbox: {{if this.value2 "yep" "nope"}}
     </PaperCheckbox>
 
-    <PaperCheckbox @value={{value3}} @onChange={{action (mut value3)}} @disabled={{true}}>
+    <PaperCheckbox @value={{this.value3}} @onChange={{action (mut this.value3)}} @disabled={{true}}>
       Checkbox (disabled)
     </PaperCheckbox>
 
-    <PaperCheckbox @value={{true}} @onChange={{action (mut value4)}} @disabled={{true}}>
+    <PaperCheckbox @value={{true}} @onChange={{action (mut this.value4)}} @disabled={{true}}>
       Checkbox (disabled and value)
     </PaperCheckbox>
 
-    <PaperCheckbox @value={{value5}} @onChange={{action (mut value5)}} @noink={{true}}>
+    <PaperCheckbox @value={{this.value5}} @onChange={{action (mut this.value5)}} @noink={{true}}>
       Checkbox (no ink)
     </PaperCheckbox>
 
-    <PaperCheckbox @label="Blockless version" @value={{value6}} @onChange={{action "toggleValue6"}} />
+    <PaperCheckbox @label="Blockless version" @value={{this.value6}} @onChange={{action "toggleValue6"}} />
 
-    <PaperCheckbox @indeterminate={{isIndeterminate}} @value={{value7}} @onChange={{action (mut value7)}}>
+    <PaperCheckbox @indeterminate={{this.isIndeterminate}} @value={{this.value7}} @onChange={{action (mut this.value7)}}>
       Indeterminate checkbox
     </PaperCheckbox>
 
-    <PaperCheckbox @disabled={{true}} @indeterminate={{isIndeterminate}} @value={{value7}} @onChange={{null}}>
+    <PaperCheckbox @disabled={{true}} @indeterminate={{this.isIndeterminate}} @value={{this.value7}} @onChange={{null}}>
       Indeterminate checkbox (disabled)
     </PaperCheckbox>
   </div>
diff --git a/tests/dummy/app/templates/demo/chips.hbs b/tests/dummy/app/templates/demo/chips.hbs
index 7c0f60a22..e031f207a 100644
--- a/tests/dummy/app/templates/demo/chips.hbs
+++ b/tests/dummy/app/templates/demo/chips.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Chips" @isDemo={{true}} />
 
 <DocContent>
@@ -12,16 +12,16 @@
     <PaperCardContent>
       {{! BEGIN-SNIPPET chips.example }}
       <h2>Default Template</h2>
-      <PaperChips @content={{fruitNames}} @readOnly={{readOnly}} @removeItem={{action "removeItem"}} @addItem={{action "addItem"}} @placeholder="Add a tag" />
+      <PaperChips @content={{this.fruitNames}} @readOnly={{this.readOnly}} @removeItem={{action "removeItem"}} @addItem={{action "addItem"}} @placeholder="Add a tag" />
 
       <h2>Custom Template</h2>
-      <PaperChips @readOnly={{readOnly}} @removeItem={{action "removeCustomItem"}} @addItem={{action "addCustomItem"}} @placeholder="Add a tag" @content={{customFruitNames}} as |item|>
+      <PaperChips @readOnly={{this.readOnly}} @removeItem={{action "removeCustomItem"}} @addItem={{action "addCustomItem"}} @placeholder="Add a tag" @content={{this.customFruitNames}} as |item|>
         <strong>{{item}}</strong>
         <em>(fruit)</em>
       </PaperChips>
 
       <h2>Chips with Autocomplete</h2>
-      <PaperChips @readOnly={{readOnly}} @removeItem={{action "removeVegetable"}} @addItem={{action "addVegetable"}} @placeholder="Add a vegetable" @content={{vegetables}} @options={{remainingVegetables}} @searchField="name" @noMatchesMessage="Not found. Click to add." as |item|>
+      <PaperChips @readOnly={{this.readOnly}} @removeItem={{action "removeVegetable"}} @addItem={{action "addVegetable"}} @placeholder="Add a vegetable" @content={{this.vegetables}} @options={{this.remainingVegetables}} @searchField="name" @noMatchesMessage="Not found. Click to add." as |item|>
         <strong>{{item.name}}</strong>
         {{#if item.family}}
           <em>{{item.family}}</em>
@@ -29,7 +29,7 @@
       </PaperChips>
 
       <h2>Chips with Autocomplete (requires match)</h2>
-      <PaperChips @readOnly={{readOnly}} @removeItem={{action "removeVegeName"}} @addItem={{action "addVegeName"}} @placeholder="Add a vegetable" @content={{vegeNames}} @options={{remainingVegeNames}} @requireMatch={{true}} />
+      <PaperChips @readOnly={{this.readOnly}} @removeItem={{action "removeVegeName"}} @addItem={{action "addVegeName"}} @placeholder="Add a vegetable" @content={{this.vegeNames}} @options={{this.remainingVegeNames}} @requireMatch={{true}} />
       {{! END-SNIPPET }}
 
       <h3>Template</h3>
@@ -49,7 +49,7 @@
 
       {{! BEGIN-SNIPPET chips.contacts-example }}
       <h2>Contact Chips</h2>
-      <PaperContactChips @readOnly={{readOnly}} @removeItem={{action "removeContact"}} @addItem={{action "addContact"}} @placeholder="Add a contact" @content={{selectedContacts}} @options={{remainingContacts}} />
+      <PaperContactChips @readOnly={{this.readOnly}} @removeItem={{action "removeContact"}} @addItem={{action "addContact"}} @placeholder="Add a contact" @content={{this.selectedContacts}} @options={{this.remainingContacts}} />
 
       <blockquote>
         <code>paper-contact-chips</code> expects the name, email address and image
@@ -60,9 +60,9 @@
         autocomplete should search against:
       </blockquote>
 
-      <PaperContactChips @readOnly={{readOnly}} @removeItem={{action "removeAltContact"}} @addItem={{action "addAltContact"}} @placeholder="Add a contact" @content={{selectedAltContacts}} @options={{remainingAltContacts}} @nameField="shortName" @emailField="emailAddress" @imageField="profileImage" @searchField="emailAddress" />
+      <PaperContactChips @readOnly={{this.readOnly}} @removeItem={{action "removeAltContact"}} @addItem={{action "addAltContact"}} @placeholder="Add a contact" @content={{this.selectedAltContacts}} @options={{this.remainingAltContacts}} @nameField="shortName" @emailField="emailAddress" @imageField="profileImage" @searchField="emailAddress" />
 
-      <PaperCheckbox @value={{readOnly}} @onChange={{action (mut readOnly)}}>
+      <PaperCheckbox @value={{this.readOnly}} @onChange={{action (mut this.readOnly)}}>
         Read Only
       </PaperCheckbox>
       {{! END-SNIPPET }}
diff --git a/tests/dummy/app/templates/demo/dialog.hbs b/tests/dummy/app/templates/demo/dialog.hbs
index e05cd42c7..c4e823df0 100644
--- a/tests/dummy/app/templates/demo/dialog.hbs
+++ b/tests/dummy/app/templates/demo/dialog.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Dialog" @isDemo={{true}} />
 
 <DocContent>
@@ -14,7 +14,7 @@
       </PaperToolbarTools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if showSourceCode "is-visible"}}">
+    <div class="doc-code-example {{if this.showSourceCode "is-visible"}}">
       <CodeSnippet @name="dialog.hbs" />
     </div>
 
@@ -38,8 +38,8 @@
           </PaperButton>
         </div>
 
-        {{#if result}}
-          <p>You dismissed the dialog with a result of "{{result}}".</p>
+        {{#if this.result}}
+          <p>You dismissed the dialog with a result of "{{this.result}}".</p>
         {{/if}}
 
         {{paper-api
@@ -70,8 +70,8 @@
 </DocContent>
 
 {{! BEGIN-SNIPPET dialog }}
-{{#if showDialogWithParent}}
-  <PaperDialog @class="flex-50" @onClose={{action "closeDialogWithParent" "cancel"}} @parent="#paper-dialog-demo" @origin={{dialogOrigin}} @clickOutsideToClose={{true}}>
+{{#if this.showDialogWithParent}}
+  <PaperDialog @class="flex-50" @onClose={{action "closeDialogWithParent" "cancel"}} @parent="#paper-dialog-demo" @origin={{this.dialogOrigin}} @clickOutsideToClose={{true}}>
     <form>
       <PaperToolbar>
         <PaperToolbarTools>
@@ -102,8 +102,8 @@
   </PaperDialog>
 {{/if}}
 
-{{#if showDialog}}
-  <PaperDialog @class="flex-77" @onClose={{action "closeDialog" "cancel"}} @origin={{dialogOrigin}} @clickOutsideToClose={{true}}>
+{{#if this.showDialog}}
+  <PaperDialog @class="flex-77" @onClose={{action "closeDialog" "cancel"}} @origin={{this.dialogOrigin}} @clickOutsideToClose={{true}}>
     <PaperToolbar>
       <PaperToolbarTools>
         <h2>Mango (Fruit)</h2>
@@ -128,29 +128,29 @@
   </PaperDialog>
 {{/if}}
 
-{{#if showPromptDialog}}
-  <PaperDialog @fullscreen={{fullscreen}} @onClose={{action "closePromptDialog" "cancel"}} @origin={{dialogOrigin}}>
+{{#if this.showPromptDialog}}
+  <PaperDialog @fullscreen={{this.fullscreen}} @onClose={{action "closePromptDialog" "cancel"}} @origin={{this.dialogOrigin}}>
 
     <PaperDialogContent>
       <h2 class="md-title">What would you name your dog?</h2>
       <p>Bowser is a common name.</p>
-      <PaperInput @placeholder="dog name" @autofocus={{true}} @value={{dogName}} @onChange={{action (mut dogName)}} />
+      <PaperInput @placeholder="dog name" @autofocus={{true}} @value={{this.dogName}} @onChange={{action (mut this.dogName)}} />
       <div>
-        <PaperCheckbox @value={{fullscreen}} @onChange={{action (mut fullscreen)}}>Display fullscreen at small window size breakpoints</PaperCheckbox>
+        <PaperCheckbox @value={{this.fullscreen}} @onChange={{action (mut this.fullscreen)}}>Display fullscreen at small window size breakpoints</PaperCheckbox>
       </div>
     </PaperDialogContent>
 
     <PaperDialogActions @class="layout-row">
       <span class="flex"></span>
       <PaperButton @primary={{true}} @onClick={{action "closePromptDialog" "cancel"}}>I'm a cat person</PaperButton>
-      <PaperButton @primary={{true}} @onClick={{action "closePromptDialog" "ok" dogName}}>Okay!</PaperButton>
+      <PaperButton @primary={{true}} @onClick={{action "closePromptDialog" "ok" this.dogName}}>Okay!</PaperButton>
     </PaperDialogActions>
 
   </PaperDialog>
 {{/if}}
 
-{{#if showAnimatedDialog}}
-  <PaperDialog @fullscreen={{fullscreen}} @onClose={{action "closeAnimatedDialog"}} @openFrom="#paper-dialog-demo" @closeTo="#bottom-of-card">
+{{#if this.showAnimatedDialog}}
+  <PaperDialog @fullscreen={{this.fullscreen}} @onClose={{action "closeAnimatedDialog"}} @openFrom="#paper-dialog-demo" @closeTo="#bottom-of-card">
 
     <PaperDialogContent>
       <h2 class="md-title">This dialog is animated!</h2>
diff --git a/tests/dummy/app/templates/demo/divider.hbs b/tests/dummy/app/templates/demo/divider.hbs
index dd787be99..0900087b1 100644
--- a/tests/dummy/app/templates/demo/divider.hbs
+++ b/tests/dummy/app/templates/demo/divider.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Divider" @isDemo={{true}} />
 
 <DocContent>
@@ -14,12 +14,12 @@
       </PaperToolbarTools>
     </PaperToolbar>
     <PaperContent>
-      <div class="doc-code-example {{if showSourceCodeFull "is-visible"}}">
+      <div class="doc-code-example {{if this.showSourceCodeFull "is-visible"}}">
         <CodeSnippet @name="divider.full.hbs" />
       </div>
       {{! BEGIN-SNIPPET divider.full }}
       <PaperList>
-        {{#each messages as |item|}}
+        {{#each this.messages as |item|}}
           <PaperItem @class="md-3-line">
             <div class="md-list-item-text">
               <h3>{{item.what}}</h3>
@@ -47,14 +47,14 @@
       </PaperToolbarTools>
     </PaperToolbar>
     <PaperContent>
-      <div class="doc-code-example {{if showSourceCodeInset "is-visible"}}">
+      <div class="doc-code-example {{if this.showSourceCodeInset "is-visible"}}">
         <CodeSnippet @name="divider.inset.hbs" />
       </div>
       {{! BEGIN-SNIPPET divider.inset }}
       <PaperList @classNames="list-demo">
-        {{#each messages as |item|}}
+        {{#each this.messages as |item index|}}
           <PaperItem @class="md-3-line">
-            <img src="/{{item.face}}?{{$index}}" class="face" alt={{item.who}}>
+            <img src="/{{item.face}}?{{index}}" class="face" alt={{item.who}}>
             <div class="md-list-item-text">
               <h3>{{item.what}}</h3>
               <h4>{{item.who}}</h4>
diff --git a/tests/dummy/app/templates/demo/grid-list.hbs b/tests/dummy/app/templates/demo/grid-list.hbs
index 8de113270..fc0445690 100644
--- a/tests/dummy/app/templates/demo/grid-list.hbs
+++ b/tests/dummy/app/templates/demo/grid-list.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
 <PageToolbar @pageTitle="Grid List" @isDemo={{true}} />
 
 <DocContent>
@@ -57,7 +56,7 @@
   <PaperContent @class="md-whiteframe-z1 grid-list-demo-dynamicTiles">
     <PaperGridList @cols="sm-2 md-4 gt-md-6" @rowHeight="4:3 gt-md-1:1" @gutter="8px gt-sm-4px" as |grid|>
 
-      {{#each tiles as |dynamicTile|}}
+      {{#each this.tiles as |dynamicTile|}}
         <grid.tile @rowspan={{dynamicTile.span.row}} @colspan={{concat dynamicTile.span.col " xs-1"}} @class={{dynamicTile.background}} as |tile|>
           <md-icon></md-icon>
           <tile.footer>
@@ -79,7 +78,7 @@
 
     <PaperGridList @cols="3 md-8 gt-md-12" @rowHeight="4:3 gt-md-1:1" @gutter="4px md-8px gt-md-16px" as |grid|>
 
-      {{#each colorTiles as |tile|}}
+      {{#each this.colorTiles as |tile|}}
 
         <grid.tile @colspan={{tile.colspan}} @rowspan={{tile.rowspan}} class={{tile.style}}>
         </grid.tile>
diff --git a/tests/dummy/app/templates/demo/input.hbs b/tests/dummy/app/templates/demo/input.hbs
index 10478abc5..922b0cb12 100644
--- a/tests/dummy/app/templates/demo/input.hbs
+++ b/tests/dummy/app/templates/demo/input.hbs
@@ -1,49 +1,49 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Input" @isDemo={{true}} />
 
 <DocContent>
   {{! BEGIN-SNIPPET input.basic-usage}}
   <div class="layout layout-sm-column">
-    <PaperInput @class="flex-30" @label="Name" @placeholder="Enter name" @value={{name}} @onChange={{action (mut name)}} />
-    <PaperInput @class="flex-30" @label="E-mail" @type="email" @value={{email}} @onChange={{action (mut email)}} />
-    <PaperInput @class="flex-40" @label="Password" @type="password" @value={{password}} @onChange={{action (mut password)}} />
+    <PaperInput @class="flex-30" @label="Name" @placeholder="Enter name" @value={{this.name}} @onChange={{action (mut this.name)}} />
+    <PaperInput @class="flex-30" @label="E-mail" @type="email" @value={{this.email}} @onChange={{action (mut this.email)}} />
+    <PaperInput @class="flex-40" @label="Password" @type="password" @value={{this.password}} @onChange={{action (mut this.password)}} />
   </div>
   <div class="layout layout-sm-column">
-    <PaperInput @class="flex" @label="Submission date" @type="date" @value={{date}} @onChange={{action (mut date)}} />
-    <PaperInput @class="flex" @label="Company (disabled)" @type="text" @value="Google" @disabled={{true}} @onChange={{action (mut foo)}} />
+    <PaperInput @class="flex" @label="Submission date" @type="date" @value={{this.date}} @onChange={{action (mut this.date)}} />
+    <PaperInput @class="flex" @label="Company (disabled)" @type="text" @value="Google" @disabled={{true}} @onChange={{action (mut this.foo)}} />
   </div>
 
-  <PaperInput @textarea={{true}} @block={{true}} @label="Biography" @maxlength={{150}} @passThru={{hash rows=5 maxRows=5}} @value={{biography}} @onChange={{action (mut biography)}} />
-  <p>Name: {{name}}</p>
-  <p>Email: {{email}}</p>
+  <PaperInput @textarea={{true}} @block={{true}} @label="Biography" @maxlength={{150}} @passThru={{hash rows=5 maxRows=5}} @value={{this.biography}} @onChange={{action (mut this.biography)}} />
+  <p>Name: {{this.name}}</p>
+  <p>Email: {{this.email}}</p>
 
   <h3>Input Errors</h3>
   <p>
-    <PaperInput @label="Address" @value={{address}} @onChange={{action (mut address)}} @required={{true}} @errorMessages={{hash
+    <PaperInput @label="Address" @value={{this.address}} @onChange={{action (mut this.address)}} @required={{true}} @errorMessages={{hash
         required="Address is required."
       }} />
-    <PaperInput @type="number" @label="Maximum Value" @value={{maxNumber}} @onChange={{action (mut maxNumber)}} @max="5" @errorMessages={{hash
+    <PaperInput @type="number" @label="Maximum Value" @value={{this.maxNumber}} @onChange={{action (mut this.maxNumber)}} @max="5" @errorMessages={{hash
         max="Enter 5 or less."
       }} />
-    <PaperInput @type="number" @label="Minimum Value" @value={{minNumber}} @onChange={{action (mut minNumber)}} @min="1" @errorMessages={{hash
+    <PaperInput @type="number" @label="Minimum Value" @value={{this.minNumber}} @onChange={{action (mut this.minNumber)}} @min="1" @errorMessages={{hash
         min="Enter at least 1."
       }} />
-    <PaperInput @label="Maximum Character Length" @value={{maxLength}} @onChange={{action (mut maxLength)}} @required={{true}} @maxlength={{10}} @errorMessages={{hash
+    <PaperInput @label="Maximum Character Length" @value={{this.maxLength}} @onChange={{action (mut this.maxLength)}} @required={{true}} @maxlength={{10}} @errorMessages={{hash
         maxlength="Maximum length exceeded."
       }} />
-    <PaperInput @label="All Constraints" @value={{allConstraints}} @onChange={{action (mut allConstraints)}} @required={{true}} @min="2" @max="10" @maxlength="2" @errorMessages={{hash
+    <PaperInput @label="All Constraints" @value={{this.allConstraints}} @onChange={{action (mut this.allConstraints)}} @required={{true}} @min="2" @max="10" @maxlength="2" @errorMessages={{hash
         maxlength="Max length exceeded."
       }} />
-    <PaperInput @label="Required asterisk only" @value={{requiredStyle}} @onChange={{action (mut requiredStyle)}} @required="style" />
+    <PaperInput @label="Required asterisk only" @value={{this.requiredStyle}} @onChange={{action (mut this.requiredStyle)}} @required="style" />
   </p>
 
   <h3>Icons</h3>
   <p>
-    <PaperInput @label="Name" @value={{name}} @onChange={{action (mut name)}} @icon="person" />
-    <PaperInput @placeholder="Phone Number" @type="text" @value={{user.phone}} @onChange={{action (mut user.phone)}} @icon="phone" />
-    <PaperInput @label="Email (no messages)" @type="email" @value={{user.email}} @onChange={{action (mut user.email)}} @icon="email" @required={{true}} @hideAllMessages={{true}} />
-    <PaperInput @placeholder="Address" @type="text" @value={{user.address}} @onChange={{action (mut user.address)}} @icon="place" />
-    <PaperInput @label="Name on right" @type="text" @value={{name2}} @onChange={{action (mut name2)}} @iconRight="person" />
+    <PaperInput @label="Name" @value={{this.name}} @onChange={{action (mut this.name)}} @icon="person" />
+    <PaperInput @placeholder="Phone Number" @type="text" @value={{this.user.phone}} @onChange={{action (mut this.user.phone)}} @icon="phone" />
+    <PaperInput @label="Email (no messages)" @type="email" @value={{this.user.email}} @onChange={{action (mut this.user.email)}} @icon="email" @required={{true}} @hideAllMessages={{true}} />
+    <PaperInput @placeholder="Address" @type="text" @value={{this.user.address}} @onChange={{action (mut this.user.address)}} @icon="place" />
+    <PaperInput @label="Name on right" @type="text" @value={{this.name2}} @onChange={{action (mut this.name2)}} @iconRight="person" />
   </p>
   {{! END-SNIPPET }}
 
@@ -68,7 +68,7 @@
   </p>
   <p>
     {{! BEGIN-SNIPPET input.attributes }}
-    <PaperInput @value={{numberTest}} @onChange={{action (mut numberTest)}} @label="Number of bagels" @type="number" @passThru={{hash min="0" step="13" }} />
+    <PaperInput @value={{this.numberTest}} @onChange={{action (mut this.numberTest)}} @label="Number of bagels" @type="number" @passThru={{hash min="0" step="13" }} />
     {{! END-SNIPPET }}
 
     <CodeSnippet @name="input.attributes.hbs" />
@@ -126,10 +126,10 @@
   </p>
   <p>
     {{! BEGIN-SNIPPET input.actions }}
-    <PaperInput @label="Event demonstration" @value={{eventTest}} @onChange={{action (mut eventTest)}} @onFocus={{action "focusReceived"}} @onBlur={{action "blurReceived"}} @onKeyDown={{action "keyDownReceived"}} />
+    <PaperInput @label="Event demonstration" @value={{this.eventTest}} @onChange={{action (mut this.eventTest)}} @onFocus={{action "focusReceived"}} @onBlur={{action "blurReceived"}} @onKeyDown={{action "keyDownReceived"}} />
     {{! END-SNIPPET }}
-    {{#if eventName}}
-      <div>The leaf controller for this route received the sent <strong>{{eventName}}</strong> action.</div>
+    {{#if this.eventName}}
+      <div>The leaf controller for this route received the sent <strong>{{this.eventName}}</strong> action.</div>
     {{/if}}
     <CodeSnippet @name="input.actions.hbs" />
   </p>
@@ -152,7 +152,7 @@
     </p>
     <div>
       {{! BEGIN-SNIPPET input.textHelper }}
-      <PaperInput @value={{emailValue}} @onChange={{action (mut emailValue)}} @label="Email" @type="email" as |input|>
+      <PaperInput @value={{this.emailValue}} @onChange={{action (mut this.emailValue)}} @label="Email" @type="email" as |input|>
         {{#unless input.hasValue}}
           <div class="hint">How can we reach you?</div>
         {{/unless}}
@@ -162,7 +162,7 @@
     </div>
   {{/paper-api}}
 
-  {{#paper-api validationApi title="Custom Validations"}}
+  {{#paper-api this.validationApi title="Custom Validations"}}
     <p>
       In addition to <code>required</code>,
       <code>min</code>, <code>max</code>,
@@ -179,7 +179,7 @@
   </p>
   <p>
     {{! BEGIN-SNIPPET input.custom-validations }}
-    <PaperInput @label="E-mail" @type="email" @value={{customemail}} @onChange={{action (mut customemail)}} @customValidations={{emailValidation}} />
+    <PaperInput @label="E-mail" @type="email" @value={{this.customemail}} @onChange={{action (mut this.customemail)}} @customValidations={{this.emailValidation}} />
     {{! END-SNIPPET }}
   </p>
 
@@ -194,7 +194,7 @@
   </p>
   <p>
     {{! BEGIN-SNIPPET input.multiple-constraints }}
-    <PaperInput @class="md-block" @label="Value should be even and equal 4." @type="email" @value={{customMultiple}} @onChange={{action (mut customMultiple)}} @customValidations={{multipleConstraints}} />
+    <PaperInput @class="md-block" @label="Value should be even and equal 4." @type="email" @value={{this.customMultiple}} @onChange={{action (mut this.customMultiple)}} @customValidations={{this.multipleConstraints}} />
     {{! END-SNIPPET }}
   </p>
   <CodeSnippet @name="input.multiple-constraints.hbs" />
@@ -214,12 +214,12 @@
   <PaperCard as |card|>
     <card.content>
       <div class="layout layout-sm-row">
-        <PaperInput @class="flex-50" @label="User name" @value={{model.username}} @onChange={{action (mut model.username)}} @errors={{this.usernameValidator}} />
+        <PaperInput @class="flex-50" @label="User name" @value={{this.model.username}} @onChange={{action (mut this.model.username)}} @errors={{this.usernameValidator}} />
       </div>
       <div class="layout layout-sm-row">
-        <PaperInput @label="Password" @class="flex-34" @type="password" @value={{model.password}} @onChange={{action (mut model.password)}} @errors={{this.passwordValidator}} />
-        <PaperInput @label="E-mail" @class="flex-33" @type="email" @value={{model.email}} @onChange={{action (mut model.email)}} @errors={{this.emailValidator}} />
-        <PaperInput @label="Retype your e-mail" @class="flex-33" @type="email" @value={{model.emailConfirmation}} @onChange={{action (mut model.emailConfirmation)}} @errors={{this.emailConfirmationValidator}} />
+        <PaperInput @label="Password" @class="flex-34" @type="password" @value={{this.model.password}} @onChange={{action (mut this.model.password)}} @errors={{this.passwordValidator}} />
+        <PaperInput @label="E-mail" @class="flex-33" @type="email" @value={{this.model.email}} @onChange={{action (mut this.model.email)}} @errors={{this.emailValidator}} />
+        <PaperInput @label="Retype your e-mail" @class="flex-33" @type="email" @value={{this.model.emailConfirmation}} @onChange={{action (mut this.model.emailConfirmation)}} @errors={{this.emailConfirmationValidator}} />
       </div>
     </card.content>
   </PaperCard>
diff --git a/tests/dummy/app/templates/demo/list.hbs b/tests/dummy/app/templates/demo/list.hbs
index 87a122835..f3feafde0 100644
--- a/tests/dummy/app/templates/demo/list.hbs
+++ b/tests/dummy/app/templates/demo/list.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="List" @isDemo={{true}} />
 
 <DocContent>
@@ -13,7 +13,7 @@
       {{! BEGIN-SNIPPET list }}
       <PaperList>
         <PaperSubheader>3 line item</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @class="md-3-line">
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <div class="md-list-item-text">
@@ -27,7 +27,7 @@
         <PaperDivider />
 
         <PaperSubheader>2 line item</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @class="md-2-line">
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <div class="md-list-item-text">
@@ -40,7 +40,7 @@
         <PaperDivider />
 
         <PaperSubheader>3 line item, long paragraph</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @class="md-3-line md-long-text">
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <div class="md-list-item-text">
@@ -57,7 +57,7 @@
         <PaperDivider />
 
         <PaperSubheader>Icons</PaperSubheader>
-        {{#each phoneNumbers as |phone|}}
+        {{#each this.phoneNumbers as |phone|}}
           <PaperItem @class="md-2-line">
             {{paper-icon "phone" class="md-avatar-icon"}}
             <div class="md-list-item-text">
@@ -86,7 +86,7 @@
       <PaperList>
 
         <PaperSubheader>Single Action Checkboxes</PaperSubheader>
-        {{#each toppings as |topping|}}
+        {{#each this.toppings as |topping|}}
           <PaperItem as |controls|>
             <p>{{topping.name}}</p>
             <div class="md-secondary-container">
@@ -122,14 +122,14 @@
           {{paper-icon "network-wifi"}}
           <p>Wi-Fi</p>
           <div class="md-secondary-container">
-            <controls.switch @secondary={{true}} @value={{wifiEnabled}} @onChange={{action (mut wifiEnabled)}} />
+            <controls.switch @secondary={{true}} @value={{this.wifiEnabled}} @onChange={{action (mut this.wifiEnabled)}} />
           </div>
         </PaperItem>
         <PaperItem @onClick={{action "transitionToBluetoothMenu"}} as |controls|>
           {{paper-icon "bluetooth"}}
           <p>Bluetooth</p>
           <div class="md-secondary-container">
-            <controls.switch @secondary={{true}} @value={{bluetoothEnabled}} @onChange={{action (mut bluetoothEnabled)}} />
+            <controls.switch @secondary={{true}} @value={{this.bluetoothEnabled}} @onChange={{action (mut this.bluetoothEnabled)}} />
           </div>
         </PaperItem>
         <PaperItem @onClick={{action "transitionToDataUsage"}}>
@@ -140,7 +140,7 @@
         <PaperDivider />
 
         <PaperSubheader>Checkbox with Secondary Action</PaperSubheader>
-        {{#each messageData as |item|}}
+        {{#each this.messageData as |item|}}
           <PaperItem as |controls|>
             <controls.checkbox @value={{item.checked}} @onChange={{action (mut item.checked)}} />
             <p>{{item.message}}</p>
@@ -155,7 +155,7 @@
         <PaperDivider />
 
         <PaperSubheader>Avatar with Secondary Action Icon</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @onClick={{action "goToPerson" item}} as |controls|>
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <p>{{item.name}}</p>
@@ -174,7 +174,7 @@
         <PaperDivider />
 
         <PaperSubheader>Clickable Avatars</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @class="md-3-line" @onClick={{action "goToPerson" item}}>
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <div class="md-list-item-text">
@@ -188,7 +188,7 @@
         <PaperDivider />
 
         <PaperSubheader>Avatar with Secondary Action Icon</PaperSubheader>
-        {{#each listData as |item|}}
+        {{#each this.listData as |item|}}
           <PaperItem @class="md-3-line" @onClick={{action "goToPerson" item}} as |controls|>
             <img src={{item.img}} alt={{item.name}} class="md-avatar">
             <div class="md-list-item-text">
@@ -203,11 +203,11 @@
         {{/each}}
 
         <PaperSubheader>Single Action Radios</PaperSubheader>
-        {{#each toppings as |topping|}}
+        {{#each this.toppings as |topping|}}
           <PaperItem as |controls|>
             <p>{{topping.name}}</p>
             <div class="md-secondary-container">
-              <controls.radio @groupValue={{radioSelectedTopping}} @value={{topping}} @secondary={{true}} @onChange={{action (mut radioSelectedTopping)}} />
+              <controls.radio @groupValue={{this.radioSelectedTopping}} @value={{topping}} @secondary={{true}} @onChange={{action (mut this.radioSelectedTopping)}} />
             </div>
           </PaperItem>
         {{/each}}
diff --git a/tests/dummy/app/templates/demo/menu.hbs b/tests/dummy/app/templates/demo/menu.hbs
index 5777c34c5..e81c31e74 100644
--- a/tests/dummy/app/templates/demo/menu.hbs
+++ b/tests/dummy/app/templates/demo/menu.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Menu" @isDemo={{true}} />
 
 <DocContent>
@@ -29,7 +29,7 @@
           </menu.trigger>
 
           <menu.content @width={{4}} as |content|>
-            {{#each items as |item|}}
+            {{#each this.items as |item|}}
               <content.menu-item @onClick={{action this.openSomething}}>
                 {{paper-icon item.icon}}
                 <span>{{item.title}}</span>
@@ -43,7 +43,7 @@
 
             <PaperDivider />
 
-            {{#each items as |item|}}
+            {{#each this.items as |item|}}
               <content.menu-item @onClick={{action this.openSomething}}>
                 {{paper-icon item.icon}} {{item.title}}
               </content.menu-item>
@@ -74,7 +74,7 @@
         <div class="menus layout-fill layout-wrap layout-row layout-align-space-between-center">
           <div class="layout-column flex-33 flex-sm-100 layout-align-center-center">
             <p>Target Mode Positioning (default)</p>
-            <PaperMenu @isOpen={{menuTwoIsOpen}} as |menu|>
+            <PaperMenu @isOpen={{this.menuTwoIsOpen}} as |menu|>
               <menu.trigger>
                 <PaperButton @onClick={{null}} @iconButton={{true}}>
                   {{paper-icon "local_phone" class="md-menu-origin"}}
@@ -82,7 +82,7 @@
               </menu.trigger>
 
               <menu.content as |content|>
-                {{#each items as |item|}}
+                {{#each this.items as |item|}}
                   <content.menu-item @onClick={{action this.openSomething}}>
                     {{paper-icon item.icon class="md-menu-align-target"}}
                     <span>{{item.title}}</span>
@@ -95,7 +95,7 @@
 
           <div class="layout-column flex-33 flex-sm-100 layout-align-center-center">
             <p>Target mode with <code class="paper">offset</code></p>
-            <PaperMenu @isOpen={{menuThreeIsOpen}} @offset="0 50" as |menu|>
+            <PaperMenu @isOpen={{this.menuThreeIsOpen}} @offset="0 50" as |menu|>
               <menu.trigger>
                 <PaperButton @onClick={{null}} @iconButton={{true}}>
                   {{paper-icon "local_phone" class="md-menu-origin"}}
@@ -103,7 +103,7 @@
               </menu.trigger>
 
               <menu.content as |content|>
-                {{#each items as |item|}}
+                {{#each this.items as |item|}}
                   <content.menu-item @onClick={{action this.openSomething}}>
                     {{paper-icon item.icon class="md-menu-align-target"}}
                     <span>{{item.title}}</span>
@@ -115,7 +115,7 @@
 
           <div class="layout-column flex-33 flex-sm-100 layout-align-center-center">
             <p><code class="paper">position="target-right target"</code></p>
-            <PaperMenu @isOpen={{menuFourIsOpen}} @position="target-right target" as |menu|>
+            <PaperMenu @isOpen={{this.menuFourIsOpen}} @position="target-right target" as |menu|>
               <menu.trigger>
                 <PaperButton @onClick={{null}} @iconButton={{true}}>
                   {{paper-icon "local_phone" class="md-menu-origin"}}
@@ -123,19 +123,19 @@
               </menu.trigger>
 
               <menu.content as |content|>
-                {{#each items as |item|}}
+                {{#each this.items as |item|}}
                   <content.menu-item @onClick={{action this.openSomething}}>
                     <p style="width: 190px;">{{item.title}}</p>
                     {{paper-icon item.icon class="md-menu-align-target"}}
                   </content.menu-item>
                 {{/each}}
-                {{#each items as |item|}}
+                {{#each this.items as |item|}}
                   <content.menu-item @onClick={{action this.openSomething}}>
                     <p style="width: 190px;">{{item.title}}</p>
                     {{paper-icon item.icon class="md-menu-align-target"}}
                   </content.menu-item>
                 {{/each}}
-                {{#each items as |item|}}
+                {{#each this.items as |item|}}
                   <content.menu-item @onClick={{action this.openSomething}}>
                     <p style="width: 190px;">{{item.title}}</p>
                     {{paper-icon item.icon class="md-menu-align-target"}}
@@ -186,7 +186,7 @@
               </menu.trigger>
 
               <menu.content @width={{6}} as |content|>
-                {{#each options as |item|}}
+                {{#each this.options as |item|}}
                   <content.menu-item @onClick={{action "openSomething"}}>
                     <span class="md-menu-align-target">Option</span> {{item}}
                   </content.menu-item>
@@ -205,7 +205,7 @@
               </menu.trigger>
 
               <menu.content @width={{4}} as |content|>
-                {{#each options as |item|}}
+                {{#each this.options as |item|}}
                   <content.menu-item @onClick={{action "openSomething"}}>
                     <span class="md-menu-align-target">Option</span> {{item}}
                   </content.menu-item>
@@ -224,7 +224,7 @@
               </menu.trigger>
 
               <menu.content @width={{2}} as |content|>
-                {{#each options as |item|}}
+                {{#each this.options as |item|}}
                   <content.menu-item @onClick={{action "openSomething"}}>
                     <span class="md-menu-align-target">Option</span> {{item}}
                   </content.menu-item>
@@ -265,7 +265,7 @@
               </menu.trigger>
 
               <menu.content @dense={{true}} as |content|>
-                {{#each options as |item|}}
+                {{#each this.options as |item|}}
                   <content.menu-item @onClick={{action "openSomething"}}>
                     <span class="md-menu-align-target">Option</span> {{item}}
                   </content.menu-item>
diff --git a/tests/dummy/app/templates/demo/progress-circular.hbs b/tests/dummy/app/templates/demo/progress-circular.hbs
index 835c2dab5..0101acb4b 100644
--- a/tests/dummy/app/templates/demo/progress-circular.hbs
+++ b/tests/dummy/app/templates/demo/progress-circular.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Progress Circular" @isDemo={{true}} />
 
 <DocContent>
@@ -7,7 +7,7 @@
   <p>For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.</p>
   <div class="layout-column layout-gt-sm-row layout-align-space-around">
     {{! BEGIN-SNIPPET progress-circular.determinate }}
-    <PaperProgressCircular @value={{determinateValue}} />
+    <PaperProgressCircular @value={{this.determinateValue}} />
     {{! END-SNIPPET }}
   </div>
   <CodeSnippet @name="progress-circular.determinate.hbs" />
@@ -38,28 +38,28 @@
   <div class="layout-column layout-gt-sm-row">
     {{! BEGIN-SNIPPET progress-circular.playground }}
     <div class="flex layout-row layout-align-space-around layout-align-center">
-      <PaperProgressCircular @value={{sliderValue}} @diameter={{sliderDiameter}} @strokeRatio={{strokeRatio}} @disabled={{isDisabled}} />
+      <PaperProgressCircular @value={{this.sliderValue}} @diameter={{this.sliderDiameter}} @strokeRatio={{this.strokeRatio}} @disabled={{this.isDisabled}} />
     </div>
     <div class="flex flex-gt-sm-33">
-      <PaperCheckbox @value={{isIndeterminate}} @onChange={{action "setIndeterminate"}}>
+      <PaperCheckbox @value={{this.isIndeterminate}} @onChange={{action "setIndeterminate"}}>
         Indeterminate
       </PaperCheckbox>
-      <PaperCheckbox @value={{isDisabled}} @onChange={{action (mut isDisabled)}}>
+      <PaperCheckbox @value={{this.isDisabled}} @onChange={{action (mut this.isDisabled)}}>
         Disabled
       </PaperCheckbox>
       <div class="layout layout-align-center-center slider-container">
-        <span class="flex">Value ({{if sliderValue sliderValue "null"}})</span>
-        <PaperSlider @class="flex" @value={{sliderValue}} @min={{0}} @max={{100}} @onChange={{action "setValue"}} />
+        <span class="flex">Value ({{if this.sliderValue this.sliderValue "null"}})</span>
+        <PaperSlider @class="flex" @value={{this.sliderValue}} @min={{0}} @max={{100}} @onChange={{action "setValue"}} />
       </div>
 
       <div class="layout layout-align-center-center slider-container">
-        <span class="flex">Diameter ({{sliderDiameter}})</span>
-        <PaperSlider @class="flex" @value={{sliderDiameter}} @min={{0}} @max={{300}} @onChange={{action (mut sliderDiameter)}} />
+        <span class="flex">Diameter ({{this.sliderDiameter}})</span>
+        <PaperSlider @class="flex" @value={{this.sliderDiameter}} @min={{0}} @max={{300}} @onChange={{action (mut this.sliderDiameter)}} />
       </div>
 
       <div class="layout layout-align-center-center slider-container">
-        <span class="flex">Stroke ratio ({{strokeRatio}})</span>
-        <PaperSlider @class="flex" @value={{strokeRatio}} @min={{0}} @max={{0.5}} @step={{0.0025}} @onChange={{action (mut strokeRatio)}} />
+        <span class="flex">Stroke ratio ({{this.strokeRatio}})</span>
+        <PaperSlider @class="flex" @value={{this.strokeRatio}} @min={{0}} @max={{0.5}} @step={{0.0025}} @onChange={{action (mut this.strokeRatio)}} />
       </div>
 
     </div>
diff --git a/tests/dummy/app/templates/demo/progress-linear.hbs b/tests/dummy/app/templates/demo/progress-linear.hbs
index 921c7d9f1..bbb85e459 100644
--- a/tests/dummy/app/templates/demo/progress-linear.hbs
+++ b/tests/dummy/app/templates/demo/progress-linear.hbs
@@ -1,4 +1,3 @@
-{{! template-lint-disable no-implicit-this }}
 <PageToolbar @pageTitle="Progress Linear" @isDemo={{true}} />
 
 <DocContent>
@@ -7,7 +6,7 @@
   <h3>Determinate mode</h3>
   <p>For operations where the percentage of the operation completed can be determined, use a determinate indicator. They give users a quick sense of how long an operation will take.</p>
   {{! BEGIN-SNIPPET progress-linear.determinate }}
-  <PaperProgressLinear @value={{determinateValue}} />
+  <PaperProgressLinear @value={{this.determinateValue}} />
   {{! END-SNIPPET }}
   <CodeSnippet @name="progress-linear.determinate.hbs" />
 
@@ -21,14 +20,14 @@
   <h3>Buffer mode</h3>
   <p>For operations where the user wants to indicate some activity or loading from the server, use the buffer indicator:</p>
   {{! BEGIN-SNIPPET progress-linear.buffer }}
-  <PaperProgressLinear @warn={{true}} @value={{determinateValue}} @bufferValue={{determinateValue2}} />
+  <PaperProgressLinear @warn={{true}} @value={{this.determinateValue}} @bufferValue={{this.determinateValue2}} />
   {{! END-SNIPPET }}
   <CodeSnippet @name="progress-linear.buffer.hbs" />
 
   <h3>Query mode</h3>
   <p>For situations where the user wants to indicate pre-loading (until the loading can actually be made), use the query indicator:</p>
   {{! BEGIN-SNIPPET progress-linear.query }}
-  <PaperProgressLinear @accent={{true}} @mode={{mode}} @value={{determinateValue}} />
+  <PaperProgressLinear @accent={{true}} @mode={{this.mode}} @value={{this.determinateValue}} />
   {{! END-SNIPPET }}
   <CodeSnippet @name="progress-linear.query.hbs" />
 </DocContent>
diff --git a/tests/dummy/app/templates/demo/radio.hbs b/tests/dummy/app/templates/demo/radio.hbs
index e9cd99cd0..26b02a484 100644
--- a/tests/dummy/app/templates/demo/radio.hbs
+++ b/tests/dummy/app/templates/demo/radio.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Radio" @isDemo={{true}} />
 <DocContent>
   <PaperCard @class="radio-button-demo">
@@ -9,10 +9,10 @@
       </p>
       <div class="layout-row layout-align-space-around">
         {{! BEGIN-SNIPPET radio.standalone-usage }}
-        <PaperRadio @toggle={{true}} @value="Toggable" @groupValue={{toggleValue}} @onChange={{action (mut toggleValue)}}>
+        <PaperRadio @toggle={{true}} @value="Toggable" @groupValue={{this.toggleValue}} @onChange={{action (mut this.toggleValue)}}>
           Toggable
         </PaperRadio>
-        <PaperRadio @label="Blockless" @toggle={{true}} @value="Blockless" @groupValue={{blocklessValue}} @onChange={{action (mut blocklessValue)}} />
+        <PaperRadio @label="Blockless" @toggle={{true}} @value="Blockless" @groupValue={{this.blocklessValue}} @onChange={{action (mut this.blocklessValue)}} />
         <PaperRadio @value={{false}} @disabled={{true}} @onChange={{null}}>
           Disabled
         </PaperRadio>
@@ -23,11 +23,11 @@
       <hr>
 
       <p>
-        Selected Value: <span class="radio-value">{{selectedFruit}}</span>
+        Selected Value: <span class="radio-value">{{this.selectedFruit}}</span>
       </p>
 
       {{! BEGIN-SNIPPET radio.basic-group-usage}}
-      <PaperRadioGroup @groupValue={{readonly selectedFruit}} @onChange={{action (mut selectedFruit)}} as |group|>
+      <PaperRadioGroup @groupValue={{readonly this.selectedFruit}} @onChange={{action (mut this.selectedFruit)}} as |group|>
         <group.radio @value="Apple" @primary={{true}}> Apple </group.radio>
         <group.radio @value="Banana" @warn={{true}}> Banana </group.radio>
         <group.radio @value="Mango"> Mango </group.radio>
@@ -42,10 +42,10 @@
         Graphic radio buttons
       </p>
       {{! BEGIN-SNIPPET radio.images }}
-      <PaperRadioGroup @groupValue={{selectedGraphic}} @onChange={{action (mut selectedGraphic)}} as |group|>
+      <PaperRadioGroup @groupValue={{this.selectedGraphic}} @onChange={{action (mut this.selectedGraphic)}} as |group|>
 
         <group.label>
-          <p>Selected Value: <span class="radio-value">{{selectedGraphic}}</span></p>
+          <p>Selected Value: <span class="radio-value">{{this.selectedGraphic}}</span></p>
         </group.label>
 
         <group.radio @value="graphic-1" @primary={{true}}>
diff --git a/tests/dummy/app/templates/demo/select.hbs b/tests/dummy/app/templates/demo/select.hbs
index d97bf0267..4b36e8b83 100644
--- a/tests/dummy/app/templates/demo/select.hbs
+++ b/tests/dummy/app/templates/demo/select.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Select" @isDemo={{true}} />
 
 <DocContent>
@@ -7,16 +7,16 @@
   <p>Enter an address</p>
   <div class="layout-row">
     {{! BEGIN-SNIPPET select.basic-usage }}
-    <PaperInput @label="Street Name" @value={{street}} @onChange={{action (mut street)}} />
-    <PaperInput @label="City" @value={{city}} @onChange={{action (mut city)}} />
-    <PaperSelect @disabled={{disableSelect}} @label="State" @options={{states}} @selected={{userState}} @onChange={{action (mut userState)}} as |state|>
+    <PaperInput @label="Street Name" @value={{this.street}} @onChange={{action (mut this.street)}} />
+    <PaperInput @label="City" @value={{this.city}} @onChange={{action (mut this.city)}} />
+    <PaperSelect @disabled={{this.disableSelect}} @label="State" @options={{this.states}} @selected={{this.userState}} @onChange={{action (mut this.userState)}} as |state|>
       {{state.abbrev}}
     </PaperSelect>
     {{! END-SNIPPET }}
   </div>
 
   <p>
-    <PaperCheckbox @label="Disable select" @value={{disableSelect}} @onChange={{action (mut disableSelect)}} />
+    <PaperCheckbox @label="Disable select" @value={{this.disableSelect}} @onChange={{action (mut this.disableSelect)}} />
   </p>
   <h3>Template</h3>
   <CodeSnippet @name="select.basic-usage.hbs" />
@@ -37,11 +37,11 @@
   <p>Pick your pizza below</p>
   <div class="layout-row">
     {{! BEGIN-SNIPPET select.option-groups }}
-    <PaperSelect @options={{sizes}} @label="Size" @required={{true}} @selected={{pizzaSize}} @onChange={{action (mut pizzaSize)}} as |size|>
+    <PaperSelect @options={{this.sizes}} @label="Size" @required={{true}} @selected={{this.pizzaSize}} @onChange={{action (mut this.pizzaSize)}} as |size|>
       {{size}}
     </PaperSelect>
-    <PaperSelect @options={{groupedToppings}} @label="Topping" @selected={{topping}} @onChange={{action (mut topping)}} as |topping|>
-      {{topping}}
+    <PaperSelect @options={{this.groupedToppings}} @label="Topping" @selected={{this.topping}} @onChange={{action (mut this.topping)}} as |topping|>
+      {{this.topping}}
     </PaperSelect>
     {{! END-SNIPPET }}
   </div>
@@ -57,12 +57,12 @@
     </p>
     <div class="layout-column layout-align-center-center" style="height: 130px;">
       {{! BEGIN-SNIPPET select.async-search }}
-      <PaperSelect @placeholder="Assign to a user" @selected={{selectedUser}} @options={{users}} @onChange={{action (mut selectedUser)}} as |user|>
+      <PaperSelect @placeholder="Assign to a user" @selected={{this.selectedUser}} @options={{this.users}} @onChange={{action (mut this.selectedUser)}} as |user|>
         {{user.name}}
       </PaperSelect>
 
-      {{#if selectedUser}}
-        <p>You have selected the user <code>{{selectedUser.name}}</code></p>
+      {{#if this.selectedUser}}
+        <p>You have selected the user <code>{{this.selectedUser.name}}</code></p>
       {{/if}}
       {{! END-SNIPPET }}
     </div>
@@ -76,7 +76,7 @@
   <div class="layout-column layout-align-center-center">
     <div class="layout-column layout-align-center-center" style="height: 130px;">
       {{! BEGIN-SNIPPET select.select-header }}
-      <PaperSelect @placeholder="Vegetable" @selected={{selectedVegetable}} @options={{vegetables}} @searchField="name" @searchPlaceholder="Search for a vegetable.." @searchEnabled={{true}} @onChange={{action (mut selectedVegetable)}} as |vegetable|>
+      <PaperSelect @placeholder="Vegetable" @selected={{this.selectedVegetable}} @options={{this.vegetables}} @searchField="name" @searchPlaceholder="Search for a vegetable.." @searchEnabled={{true}} @onChange={{action (mut this.selectedVegetable)}} as |vegetable|>
         {{vegetable.name}}
       </PaperSelect>
 
diff --git a/tests/dummy/app/templates/demo/sidenav.hbs b/tests/dummy/app/templates/demo/sidenav.hbs
index 8a3e9de9b..cde678cfe 100644
--- a/tests/dummy/app/templates/demo/sidenav.hbs
+++ b/tests/dummy/app/templates/demo/sidenav.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Sidenav" @isDemo={{true}} />
 
 <DocContent>
@@ -14,7 +14,7 @@
       </toolbar.tools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if showSourceCode "is-visible"}}">
+    <div class="doc-code-example {{if this.showSourceCode "is-visible"}}">
       <CodeSnippet @name="sidenav.basic-usage.hbs" />
     </div>
 
@@ -22,7 +22,7 @@
       {{! BEGIN-SNIPPET sidenav.basic-usage }}
       <PaperSidenavContainer @class="inner-sidenav">
 
-        <PaperSidenav @class="md-whiteframe-z2" @name="left" @open={{leftSideBarOpen}} @onToggle={{action (mut leftSideBarOpen)}}>
+        <PaperSidenav @class="md-whiteframe-z2" @name="left" @open={{this.leftSideBarOpen}} @onToggle={{action (mut this.leftSideBarOpen)}}>
           <PaperToolbar as |toolbar|>
             <toolbar.tools>Left Sidenav</toolbar.tools>
           </PaperToolbar>
@@ -38,10 +38,10 @@
               The right sidenav never "locks open" because we set <code>lockedOpen=false</code>.
             </p>
             <p>
-              Left sidenav is <strong>{{if leftSideBarOpen "opened" "closed"}}</strong>.
+              Left sidenav is <strong>{{if this.leftSideBarOpen "opened" "closed"}}</strong>.
             </p>
             <p>
-              Right sidenav is <strong>{{if rightSideBarOpen "opened" "closed"}}</strong>.
+              Right sidenav is <strong>{{if this.rightSideBarOpen "opened" "closed"}}</strong>.
             </p>
 
             <PaperSidenavToggle @name="left" as |toggleAction|>
@@ -59,7 +59,7 @@
           </div>
         </PaperCardContent>
 
-        <PaperSidenav @class="md-whiteframe-z2" @name="right" @position="right" @open={{rightSideBarOpen}} @lockedOpen={{false}} @onToggle={{action (mut rightSideBarOpen)}}>
+        <PaperSidenav @class="md-whiteframe-z2" @name="right" @position="right" @open={{this.rightSideBarOpen}} @lockedOpen={{false}} @onToggle={{action (mut this.rightSideBarOpen)}}>
           <PaperToolbar as |toolbar|>
             <toolbar.tools>Right Sidenav</toolbar.tools>
           </PaperToolbar>
@@ -85,7 +85,7 @@
       </toolbar.tools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if persistentCode "is-visible"}}">
+    <div class="doc-code-example {{if this.persistentCode "is-visible"}}">
       <CodeSnippet @name="sidenav.persistent.hbs" />
     </div>
 
@@ -93,7 +93,7 @@
       {{! BEGIN-SNIPPET sidenav.persistent }}
       <PaperSidenavContainer @class="inner-sidenav">
 
-        <PaperSidenav @class="md-whiteframe-z2" @name="left2" @open={{leftSideBarOpen2}} @lockedOpen={{leftSideBarLockedOpen}} @onToggle={{action (mut leftSideBarOpen2)}}>
+        <PaperSidenav @class="md-whiteframe-z2" @name="left2" @open={{this.leftSideBarOpen2}} @lockedOpen={{this.leftSideBarLockedOpen}} @onToggle={{action (mut this.leftSideBarOpen2)}}>
           <PaperToolbar as |toolbar|>
             <toolbar.tools>Left Sidenav</toolbar.tools>
           </PaperToolbar>
@@ -109,11 +109,11 @@
               This corresponds to the "persistent sidenav" pattern in the material spec.
             </p>
             <p>
-              Left sidenav is <strong>{{if leftSideBarLockedOpen "locked" "unlocked"}}</strong>.
+              Left sidenav is <strong>{{if this.leftSideBarLockedOpen "locked" "unlocked"}}</strong>.
             </p>
 
             <PaperButton @raised={{true}} @onClick={{action "toggle" "leftSideBarLockedOpen"}}>
-              {{if leftSideBarLockedOpen "Unlock" "Lock"}} left sidenav
+              {{if this.leftSideBarLockedOpen "Unlock" "Lock"}} left sidenav
             </PaperButton>
 
           </div>
diff --git a/tests/dummy/app/templates/demo/slider.hbs b/tests/dummy/app/templates/demo/slider.hbs
index 180495a28..b86cdc097 100644
--- a/tests/dummy/app/templates/demo/slider.hbs
+++ b/tests/dummy/app/templates/demo/slider.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Slider" @isDemo={{true}} />
 
 <DocContent @class="slider-demo">
@@ -11,59 +11,59 @@
     <PaperCardContent @class="flex">
       {{! BEGIN-SNIPPET slider }}
       <h2>
-        RGB <span style={{colorStyle}}>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        RGB <span style={{this.colorStyle}}>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
       </h2>
 
       <div class="layout layout-align-center-center slider-container">
         <span>R</span>
-        <PaperSlider @class="flex" @min={{0}} @max={{255}} @value={{color.red}} @onChange={{action (mut color.red)}} />
-        <PaperInput @type="number" @value={{color.red}} @onChange={{action (mut color.red)}} />
+        <PaperSlider @class="flex" @min={{0}} @max={{255}} @value={{this.color.red}} @onChange={{action (mut this.color.red)}} />
+        <PaperInput @type="number" @value={{this.color.red}} @onChange={{action (mut this.color.red)}} />
       </div>
 
       <div class="layout layout-align-center-center slider-container">
         <span>G</span>
-        <PaperSlider @class="flex md-accent" @min={{0}} @max={{255}} @value={{color.green}} @onChange={{action (mut color.green)}} />
-        <PaperInput @type="number" @value={{color.green}} @onChange={{action (mut color.green)}} />
+        <PaperSlider @class="flex md-accent" @min={{0}} @max={{255}} @value={{this.color.green}} @onChange={{action (mut this.color.green)}} />
+        <PaperInput @type="number" @value={{this.color.green}} @onChange={{action (mut this.color.green)}} />
       </div>
 
       <div class="layout layout-align-center-center slider-container">
         <span>B</span>
-        <PaperSlider @class="flex md-primary" @min={{0}} @max={{255}} @value={{color.blue}} @onChange={{action (mut color.blue)}} />
-        <PaperInput @type="number" @value={{color.blue}} @onChange={{action (mut color.blue)}} />
+        <PaperSlider @class="flex md-primary" @min={{0}} @max={{255}} @value={{this.color.blue}} @onChange={{action (mut this.color.blue)}} />
+        <PaperInput @type="number" @value={{this.color.blue}} @onChange={{action (mut this.color.blue)}} />
       </div>
 
-      <h2>Rating: {{rating}}/5 - demo of theming classes</h2>
+      <h2>Rating: {{this.rating}}/5 - demo of theming classes</h2>
       <div class="layout layout-align-center-center slider-container">
         <div class="layout flex-10 layout-align-center-center">
           <span>default</span>
         </div>
-        <PaperSlider @class="flex" @discrete={{true}} @value={{rating1}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut rating1)}} />
+        <PaperSlider @class="flex" @discrete={{true}} @value={{this.rating1}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut this.rating1)}} />
       </div>
       <div class="layout layout-align-center-center slider-container">
         <div class="layout flex-10 layout-align-center-center">
           <span>md-warn</span>
         </div>
-        <PaperSlider @class="flex" @warn={{true}} @discrete={{true}} @value={{rating2}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut rating2)}} />
+        <PaperSlider @class="flex" @warn={{true}} @discrete={{true}} @value={{this.rating2}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut this.rating2)}} />
       </div>
       <div class="layout layout-align-center-center slider-container">
         <div class="layout flex-10 layout-align-center-center">
           <span>md-primary</span>
         </div>
-        <PaperSlider @class="flex" @primary={{true}} @discrete={{true}} @value={{rating3}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut rating3)}} />
+        <PaperSlider @class="flex" @primary={{true}} @discrete={{true}} @value={{this.rating3}} @step={{1}} @min={{1}} @max={{5}} @onChange={{action (mut this.rating3)}} />
       </div>
 
       <h2>Disabled</h2>
       <div class="layout layout-align-center-center slider-container">
         <PaperIcon @icon="brightness-low" />
-        <PaperSlider @class="flex" @value={{disabled1}} @disabled={{isSliderDisabled}} @onChange={{action (mut disabled1)}} />
-        <PaperInput @type="number" @value={{disabled1}} @onChange={{action (mut disabled1)}} />
+        <PaperSlider @class="flex" @value={{this.disabled1}} @disabled={{this.isSliderDisabled}} @onChange={{action (mut this.disabled1)}} />
+        <PaperInput @type="number" @value={{this.disabled1}} @onChange={{action (mut this.disabled1)}} />
       </div>
-      <PaperCheckbox @value={{isSliderDisabled}} @onChange={{action (mut isSliderDisabled)}} />
-      <PaperSlider @value={{disabled2}} @disabled={{true}} />
+      <PaperCheckbox @value={{this.isSliderDisabled}} @onChange={{action (mut this.isSliderDisabled)}} />
+      <PaperSlider @value={{this.disabled2}} @disabled={{true}} />
 
       <h2>Disabled, Discrete</h2>
-      <PaperSlider @value={{discreteDisabled1}} @disabled={{true}} @discrete={{true}} @step={{3}} @min={{0}} @max={{10}} />
-      <PaperSlider @value={{discreteDisabled2}} @disabled={{true}} @discrete={{true}} @step={{10}} />
+      <PaperSlider @value={{this.discreteDisabled1}} @disabled={{true}} @discrete={{true}} @step={{3}} @min={{0}} @max={{10}} />
+      <PaperSlider @value={{this.discreteDisabled2}} @disabled={{true}} @discrete={{true}} @step={{10}} />
       {{! END-SNIPPET }}
 
       <h3>Template</h3>
diff --git a/tests/dummy/app/templates/demo/speed-dial.hbs b/tests/dummy/app/templates/demo/speed-dial.hbs
index 3d35d7f25..366f4982a 100644
--- a/tests/dummy/app/templates/demo/speed-dial.hbs
+++ b/tests/dummy/app/templates/demo/speed-dial.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Speed Dial" @isDemo={{true}} />
 
 <DocContent>
@@ -14,7 +14,7 @@
         </PaperToolbarTools>
       </PaperToolbar>
 
-      <div class="doc-code-example {{if showBasicUsageSourceCode "is-visible"}}">
+      <div class="doc-code-example {{if this.showBasicUsageSourceCode "is-visible"}}">
         <CodeSnippet @name="speed-dial-basic-usage.hbs" />
       </div>
 
@@ -22,7 +22,7 @@
         <PaperContent>
           <div class="layout-align-center-center layout-row" style="min-height: 300px; overflow: hidden">
             {{! BEGIN-SNIPPET speed-dial-basic-usage}}
-            <PaperSpeedDial @animation={{animation}} @direction={{direction}} @open={{open}} @onToggle={{action (mut open)}} as |dial|>
+            <PaperSpeedDial @animation={{this.animation}} @direction={{this.direction}} @open={{this.open}} @onToggle={{action (mut this.open)}} as |dial|>
               <dial.trigger>
                 <PaperButton @fab={{true}}>
                   {{paper-icon "menu"}}
@@ -31,19 +31,19 @@
 
               <dial.actions as |actions|>
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "people"}}
                   </PaperButton>
                 </actions.action>
 
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "accessibility"}}
                   </PaperButton>
                 </actions.action>
 
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "check-circle"}}
                   </PaperButton>
                 </actions.action>
@@ -58,7 +58,7 @@
 
             <div class="layout-column layout-align-start-center">
               <h4>Direction</h4>
-              <PaperRadioGroup @groupValue={{direction}} @onChange={{action (mut direction)}} as |group|>
+              <PaperRadioGroup @groupValue={{this.direction}} @onChange={{action (mut this.direction)}} as |group|>
                 <group.radio @value="up">Up</group.radio>
                 <group.radio @value="down">Down</group.radio>
                 <group.radio @value="left">Left</group.radio>
@@ -68,14 +68,14 @@
 
             <div class="layout-column layout-align-start-center">
               <h4>Open/Closed</h4>
-              <PaperCheckbox @value={{open}} @onChange={{action (mut open)}}>
+              <PaperCheckbox @value={{this.open}} @onChange={{action (mut this.open)}}>
                 open
               </PaperCheckbox>
             </div>
 
             <div class="layout-column layout-align-start-center">
               <h4>Animation</h4>
-              <PaperRadioGroup @groupValue={{animation}} @onChange={{action (mut animation)}} as |group|>
+              <PaperRadioGroup @groupValue={{this.animation}} @onChange={{action (mut this.animation)}} as |group|>
                 <group.radio @value="fling">Fling</group.radio>
                 <group.radio @value="scale">Scale</group.radio>
               </PaperRadioGroup>
@@ -115,7 +115,7 @@
         </PaperToolbarTools>
       </PaperToolbar>
 
-      <div class="doc-code-example {{if showAdvancedUsageSourceCode "is-visible"}}">
+      <div class="doc-code-example {{if this.showAdvancedUsageSourceCode "is-visible"}}">
         <CodeSnippet @name="speed-dial-advanced-usage.hbs" />
       </div>
 
@@ -123,7 +123,7 @@
         <PaperContent>
           <div class="layout-align-center-center layout-row" style="min-height: 300px; overflow: hidden">
             {{! BEGIN-SNIPPET speed-dial-advanced-usage}}
-            <PaperSpeedDial @onMouseEnter={{action (mut open2) true}} @onMouseLeave={{action (mut open2) false}} @open={{open2}} @onToggle={{action (mut open2)}} @hoverFull={{hoverFull}} as |dial|>
+            <PaperSpeedDial @onMouseEnter={{action (mut this.open2) true}} @onMouseLeave={{action (mut this.open2) false}} @open={{this.open2}} @onToggle={{action (mut this.open2)}} @hoverFull={{this.hoverFull}} as |dial|>
               <dial.trigger>
                 <PaperButton @fab={{true}}>
                   {{paper-icon "menu"}}
@@ -132,19 +132,19 @@
 
               <dial.actions as |actions|>
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "people"}}
                   </PaperButton>
                 </actions.action>
 
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "accessibility"}}
                   </PaperButton>
                 </actions.action>
 
                 <actions.action>
-                  <PaperButton @mini={{true}} @onClick={{action (mut showDialog) true}}>
+                  <PaperButton @mini={{true}} @onClick={{action (mut this.showDialog) true}}>
                     {{paper-icon "check-circle"}}
                   </PaperButton>
                 </actions.action>
@@ -166,7 +166,7 @@
           <code>hoverFull=true</code>. Try it with the following checkbox:
         </p>
         <p>
-          <PaperCheckbox @value={{hoverFull}} @onChange={{action (mut hoverFull)}}>
+          <PaperCheckbox @value={{this.hoverFull}} @onChange={{action (mut this.hoverFull)}}>
             hoverFull
           </PaperCheckbox>
         </p>
@@ -175,8 +175,8 @@
   </div>
 </DocContent>
 
-{{#if showDialog}}
-  <PaperDialog @fullscreen={{fullscreen}} @onClose={{action (mut showDialog) false}}>
+{{#if this.showDialog}}
+  <PaperDialog @fullscreen={{this.fullscreen}} @onClose={{action (mut this.showDialog) false}}>
 
     <PaperDialogContent>
       <h2 class="md-title">An action was clicked!</h2>
@@ -185,7 +185,7 @@
 
     <PaperDialogActions @class="layout-row">
       <span class="flex"></span>
-      <PaperButton @primary={{true}} @onClick={{action (mut showDialog) false}}>Okay!</PaperButton>
+      <PaperButton @primary={{true}} @onClick={{action (mut this.showDialog) false}}>Okay!</PaperButton>
     </PaperDialogActions>
 
   </PaperDialog>
diff --git a/tests/dummy/app/templates/demo/switch.hbs b/tests/dummy/app/templates/demo/switch.hbs
index 04372ef8d..9f4b7b10b 100644
--- a/tests/dummy/app/templates/demo/switch.hbs
+++ b/tests/dummy/app/templates/demo/switch.hbs
@@ -1,26 +1,26 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Switch" @isDemo={{true}} />
 
 <DocContent>
   <p>
     {{! BEGIN-SNIPPET switch }}
-    <PaperSwitch @value={{booleanProp1}} @onChange={{action (mut booleanProp1)}}>
-      {{booleanProp1}}
+    <PaperSwitch @value={{this.booleanProp1}} @onChange={{action (mut this.booleanProp1)}}>
+      {{this.booleanProp1}}
     </PaperSwitch>
 
-    <PaperSwitch @value={{booleanProp2}} @onChange={{action (mut booleanProp2)}}>
-      {{booleanProp2}}
+    <PaperSwitch @value={{this.booleanProp2}} @onChange={{action (mut this.booleanProp2)}}>
+      {{this.booleanProp2}}
     </PaperSwitch>
 
-    <PaperSwitch @value={{booleanProp3}} @onChange={{action "changeBooleanProp" "3"}} @disabled={{true}}>
+    <PaperSwitch @value={{this.booleanProp3}} @onChange={{action "changeBooleanProp" "3"}} @disabled={{true}}>
       Disabled switch
     </PaperSwitch>
 
-    <PaperSwitch @value={{booleanProp4}} @onChange={{action "changeBooleanProp" "4"}} @noink={{true}}>
+    <PaperSwitch @value={{this.booleanProp4}} @onChange={{action "changeBooleanProp" "4"}} @noink={{true}}>
       Noink switch
     </PaperSwitch>
 
-    <PaperSwitch @label="Blockless version" @value={{booleanProp5}} @onChange={{action "changeBooleanProp" "5"}} />
+    <PaperSwitch @label="Blockless version" @value={{this.booleanProp5}} @onChange={{action "changeBooleanProp" "5"}} />
     {{! END-SNIPPET }}
   </p>
   <h3>Template</h3>
diff --git a/tests/dummy/app/templates/demo/tabs.hbs b/tests/dummy/app/templates/demo/tabs.hbs
index a9296ab55..551c49f1e 100644
--- a/tests/dummy/app/templates/demo/tabs.hbs
+++ b/tests/dummy/app/templates/demo/tabs.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this no-unbalanced-curlies }}
+{{! template-lint-disable no-action no-curly-component-invocation no-unbalanced-curlies }}
 <PageToolbar @pageTitle="Tabs" @isDemo={{true}} />
 
 <DocContent @class="tabs-demo">
@@ -15,14 +15,14 @@
         </PaperToolbarTools>
       </PaperToolbar>
 
-      <div class="doc-code-example {{if showBasicUsageSourceCode "is-visible"}}">
+      <div class="doc-code-example {{if this.showBasicUsageSourceCode "is-visible"}}">
         <CodeSnippet @name="basic-usage.hbs" />
       </div>
 
       <div class="doc-content-example">
         <PaperContent>
           {{! BEGIN-SNIPPET basic-usage}}
-          <PaperTabs @center={{center}} @stretch={{stretch}} @borderBottom={{borderBottom}} @selected={{selectedBasicTab}} @onChange={{action (mut selectedBasicTab)}} as |tabs|>
+          <PaperTabs @center={{this.center}} @stretch={{this.stretch}} @borderBottom={{this.borderBottom}} @selected={{this.selectedBasicTab}} @onChange={{action (mut this.selectedBasicTab)}} as |tabs|>
             <tabs.tab>
               Page One
             </tabs.tab>
@@ -40,7 +40,7 @@
             </tabs.tab>
           </PaperTabs>
 
-          {{#liquid-bind (hash tab=selectedBasicTab) class="md-padding" as |current|}}
+          {{#liquid-bind (hash tab=this.selectedBasicTab) class="md-padding" as |current|}}
             <h1 class="md-display-2">Tab {{current.tab}}</h1>
             <p>
               Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -53,15 +53,15 @@
         </PaperContent>
         <PaperCardContent>
 
-          <PaperCheckbox @value={{center}} @onChange={{action (mut center)}}>
+          <PaperCheckbox @value={{this.center}} @onChange={{action (mut this.center)}}>
             Center tabs
           </PaperCheckbox>
 
-          <PaperCheckbox @value={{stretch}} @onChange={{action (mut stretch)}}>
+          <PaperCheckbox @value={{this.stretch}} @onChange={{action (mut this.stretch)}}>
             Stretch tabs
           </PaperCheckbox>
 
-          <PaperCheckbox @value={{borderBottom}} @onChange={{action (mut borderBottom)}}>
+          <PaperCheckbox @value={{this.borderBottom}} @onChange={{action (mut this.borderBottom)}}>
             Border bottom
           </PaperCheckbox>
 
@@ -111,25 +111,25 @@
         </PaperToolbarTools>
       </PaperToolbar>
 
-      <div class="doc-code-example {{if showDynamicUsageSourceCode "is-visible"}}">
+      <div class="doc-code-example {{if this.showDynamicUsageSourceCode "is-visible"}}">
         <CodeSnippet @name="dynamic-usage.hbs" />
       </div>
 
       <div class="doc-content-example">
         <PaperContent>
           {{! BEGIN-SNIPPET dynamic-usage}}
-          <PaperTabs @primary={{true}} @borderBottom={{true}} @selected={{selectedChapter}} @onChange={{action (mut selectedChapter)}} as |tabs|>
-            {{#each chapters as |chapter|}}
+          <PaperTabs @primary={{true}} @borderBottom={{true}} @selected={{this.selectedChapter}} @onChange={{action (mut this.selectedChapter)}} as |tabs|>
+            {{#each this.chapters as |chapter|}}
               <tabs.tab @value={{chapter}}>
                 {{chapter.title}}
               </tabs.tab>
             {{/each}}
           </PaperTabs>
 
-          {{#liquid-bind (hash tab=selectedChapter.index m=selectedChapter) class="md-padding dynamic-animation" as |current|}}
+          {{#liquid-bind (hash tab=this.selectedChapter.index m=this.selectedChapter) class="md-padding dynamic-animation" as |current|}}
             <h1 class="md-display-2">{{current.m.title}}</h1>
             <p>{{current.m.body}}</p>
-            <PaperButton @primary={{true}} @raised={{true}} @disabled={{eq chapters.length 1}} @onClick={{action "removeChapter" current.m}}>
+            <PaperButton @primary={{true}} @raised={{true}} @disabled={{eq this.chapters.length 1}} @onClick={{action "removeChapter" current.m}}>
               Remove chapter
             </PaperButton>
           {{/liquid-bind}}
@@ -141,10 +141,10 @@
 
       <PaperCardContent>
         <div class="md-padding layout-row layout-align-space-around-start">
-          <PaperInput @class="flex-20" @label="Title" @value={{newTitle}} @required={{true}} @onChange={{action (mut newTitle)}} />
-          <PaperInput @class="flex-60" @label="Content" @textarea={{true}} @value={{newContent}} @required={{true}} @onChange={{action (mut newContent)}} />
+          <PaperInput @class="flex-20" @label="Title" @value={{this.newTitle}} @required={{true}} @onChange={{action (mut this.newTitle)}} />
+          <PaperInput @class="flex-60" @label="Content" @textarea={{true}} @value={{this.newContent}} @required={{true}} @onChange={{action (mut this.newContent)}} />
           <div class="flex-20 layout-row layout-align-center-start">
-            <PaperButton @primary={{true}} @raised={{true}} @disabled={{not (and newTitle newContent)}} @onClick={{action "addChapter"}}>
+            <PaperButton @primary={{true}} @raised={{true}} @disabled={{not (and this.newTitle this.newContent)}} @onClick={{action "addChapter"}}>
               Add chapter
             </PaperButton>
           </div>
@@ -179,14 +179,14 @@
         </PaperToolbarTools>
       </PaperToolbar>
 
-      <div class="doc-code-example {{if showRoutableUsageSourceCode "is-visible"}}">
+      <div class="doc-code-example {{if this.showRoutableUsageSourceCode "is-visible"}}">
         <CodeSnippet @name="routable-usage.hbs" />
       </div>
 
       <div class="doc-content-example">
         <PaperContent>
           {{! BEGIN-SNIPPET routable-usage}}
-          <PaperTabs @selected={{currentRouteName}} @borderBottom={{true}} @onChange={{action "noop"}} as |tabs|>
+          <PaperTabs @selected={{this.currentRouteName}} @borderBottom={{true}} @onChange={{action "noop"}} as |tabs|>
             <tabs.tab @value="demo.tabs.index" @href={{href-to "demo.tabs.index"}}>
               Index
             </tabs.tab>
diff --git a/tests/dummy/app/templates/demo/toast.hbs b/tests/dummy/app/templates/demo/toast.hbs
index b8dedef6e..eda132433 100644
--- a/tests/dummy/app/templates/demo/toast.hbs
+++ b/tests/dummy/app/templates/demo/toast.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Toast" @isDemo={{true}} />
 
 <DocContent>
@@ -14,7 +14,7 @@
       </PaperToolbarTools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if showSourceCode "is-visible"}}">
+    <div class="doc-code-example {{if this.showSourceCode "is-visible"}}">
       <CodeSnippet @name="toast.hbs" />
     </div>
 
@@ -37,24 +37,24 @@
         <div class="layout-row layout-wrap layout-xs-column layout-sm-column">
 
           <div class="flex">
-            <PaperRadioGroup @groupValue={{positionX}} @onChange={{action (mut positionX)}} as |group|>
+            <PaperRadioGroup @groupValue={{this.positionX}} @onChange={{action (mut this.positionX)}} as |group|>
               <group.radio @value="left">Left</group.radio>
               <group.radio @value="right">Right</group.radio>
             </PaperRadioGroup>
           </div>
           <div class="flex">
-            <PaperRadioGroup @groupValue={{positionY}} @onChange={{action (mut positionY)}} as |group|>
+            <PaperRadioGroup @groupValue={{this.positionY}} @onChange={{action (mut this.positionY)}} as |group|>
               <group.radio @value="top">Top</group.radio>
               <group.radio @value="bottom">Bottom</group.radio>
             </PaperRadioGroup>
           </div>
           <div class="flex">
-            <PaperCheckbox @value={{capsule}} @onChange={{action (mut capsule)}}>
+            <PaperCheckbox @value={{this.capsule}} @onChange={{action (mut this.capsule)}}>
               capsule
             </PaperCheckbox>
           </div>
           <div class="flex">
-            <PaperCheckbox @value={{swipeToClose}} @flex={{true}} @onChange={{action (mut swipeToClose)}}>
+            <PaperCheckbox @value={{this.swipeToClose}} @flex={{true}} @onChange={{action (mut this.swipeToClose)}}>
               swipeToClose
             </PaperCheckbox>
           </div>
@@ -63,8 +63,8 @@
         <h3>duration</h3>
         <div class="layout layout-align-center-center slider-container">
           {{paper-icon "watch later"}}
-          <PaperSlider @class="flex" @value={{duration}} @max={{6000}} @onChange={{action (mut duration)}} />
-          <PaperInput @type="number" @value={{duration}} @onChange={{action (mut duration)}} />
+          <PaperSlider @class="flex" @value={{this.duration}} @max={{6000}} @onChange={{action (mut this.duration)}} />
+          <PaperInput @type="number" @value={{this.duration}} @onChange={{action (mut this.duration)}} />
         </div>
 
         {{paper-api
@@ -98,7 +98,7 @@
       </PaperToolbarTools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if showSourceCode "is-visible"}}">
+    <div class="doc-code-example {{if this.showSourceCode "is-visible"}}">
       <CodeSnippet @name="toaster.js" />
     </div>
 
@@ -110,11 +110,11 @@
         <h3>Options</h3>
 
         <div class="layout-column">
-          <PaperInput @label="Toast text" @value={{toastText}} @onChange={{action (mut toastText)}} />
+          <PaperInput @label="Toast text" @value={{this.toastText}} @onChange={{action (mut this.toastText)}} />
 
           <strong>Toast class</strong>
           <div>
-            <PaperRadioGroup @class="layout-row" @groupValue={{toastClass}} @onChange={{action (mut toastClass)}} as |group|>
+            <PaperRadioGroup @class="layout-row" @groupValue={{this.toastClass}} @onChange={{action (mut this.toastClass)}} as |group|>
               <group.radio @value="">[none]</group.radio>
               <group.radio @value="md-accent">md-accent</group.radio>
               <group.radio @value="md-warn">md-warn</group.radio>
@@ -131,7 +131,7 @@
           </PaperButton>
         </div>
         <ul>
-          {{#each paperToaster.queue as |toast index|}}
+          {{#each this.paperToaster.queue as |toast index|}}
             <li>
               "{{toast.text}}" -
               {{#if (eq index 0)}}
@@ -191,15 +191,15 @@
 </DocContent>
 
 {{! BEGIN-SNIPPET toast }}
-{{#if showToast}}
-  <PaperToast @duration={{duration}} @position={{concat positionY " " positionX}} @capsule={{capsule}} @swipeToClose={{swipeToClose}} @onClose={{action "closeToast"}} as |toast|>
+{{#if this.showToast}}
+  <PaperToast @duration={{this.duration}} @position={{concat this.positionY " " this.positionX}} @capsule={{this.capsule}} @swipeToClose={{this.swipeToClose}} @onClose={{action "closeToast"}} as |toast|>
     <toast.text>Hello</toast.text>
     <PaperButton @accent={{true}} @onClick={{action "buttonAction"}}>Undo</PaperButton>
   </PaperToast>
 {{/if}}
 
-{{#if showToastWithout}}
-  <PaperToast @duration={{duration}} @position={{concat positionY " " positionX}} @capsule={{capsule}} @swipeToClose={{swipeToClose}} @onClose={{action "closeToastWithout"}} as |toast|>
+{{#if this.showToastWithout}}
+  <PaperToast @duration={{this.duration}} @position={{concat this.positionY " " this.positionX}} @capsule={{this.capsule}} @swipeToClose={{this.swipeToClose}} @onClose={{action "closeToastWithout"}} as |toast|>
     <toast.text>Hello</toast.text>
   </PaperToast>
 {{/if}}
diff --git a/tests/dummy/app/templates/demo/tooltip.hbs b/tests/dummy/app/templates/demo/tooltip.hbs
index 6c33588f8..abecb4a8c 100644
--- a/tests/dummy/app/templates/demo/tooltip.hbs
+++ b/tests/dummy/app/templates/demo/tooltip.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Tooltip" @isDemo={{true}} />
 
 <DocContent>
@@ -11,13 +11,13 @@
         <PaperButton @onClick={{action "toggle" "showSourceCode"}} @iconButton={{true}}>
           <PaperIcon @icon="code" />
           <PaperTooltip>
-            {{if showSourceCode "Hide" "Show"}} code
+            {{if this.showSourceCode "Hide" "Show"}} code
           </PaperTooltip>
         </PaperButton>
       </PaperToolbarTools>
     </PaperToolbar>
 
-    <div class="doc-code-example {{if showSourceCode "is-visible"}}">
+    <div class="doc-code-example {{if this.showSourceCode "is-visible"}}">
       <CodeSnippet @name="tooltip.hbs" />
     </div>
 
@@ -39,28 +39,28 @@
           {{! BEGIN-SNIPPET tooltip }}
           <PaperButton @raised={{true}}>
             A button
-            <PaperTooltip @position={{position}}>
+            <PaperTooltip @position={{this.position}}>
               Hey! I'm a tooltip. Çup?
             </PaperTooltip>
           </PaperButton>
 
           <PaperButton @iconButton={{true}} @raised={{true}}>
             {{paper-icon "create"}}
-            <PaperTooltip @position={{position}}>
+            <PaperTooltip @position={{this.position}}>
               Create
             </PaperTooltip>
           </PaperButton>
 
           <PaperButton @fab={{true}} @raised={{true}} @accent={{true}}>
             {{paper-icon "delete"}}
-            <PaperTooltip @position={{position}}>
+            <PaperTooltip @position={{this.position}}>
               Delete
             </PaperTooltip>
           </PaperButton>
 
           <div>
             {{#paper-icon "info"}}
-              <PaperTooltip @position={{position}}>
+              <PaperTooltip @position={{this.position}}>
                 Icon tooltip
               </PaperTooltip>
             {{/paper-icon}}
@@ -68,7 +68,7 @@
           {{! END-SNIPPET tooltip }}
         </div>
 
-        <PaperRadioGroup @groupValue={{position}} @onChange={{action (mut position)}} as |group|>
+        <PaperRadioGroup @groupValue={{this.position}} @onChange={{action (mut this.position)}} as |group|>
           <group.radio @value="bottom">
             Bottom
           </group.radio>
diff --git a/tests/dummy/app/templates/forms.hbs b/tests/dummy/app/templates/forms.hbs
index b95f89fdd..8f9ca8fbe 100644
--- a/tests/dummy/app/templates/forms.hbs
+++ b/tests/dummy/app/templates/forms.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Forms" @isDemo={{false}} />
 
 <DocContent @class="card-demo">
@@ -27,14 +27,14 @@
       <PaperForm @onSubmit={{action "basicSubmitAction"}} as |form|>
         <div class="layout-row">
           <div class="layout-column flex-50">
-            <form.input @label="First Name" @value={{firstName}} @onChange={{action (mut firstName)}} @required={{true}} />
-            <form.input @label="Last Name" @value={{lastName}} @onChange={{action (mut lastName)}} />
+            <form.input @label="First Name" @value={{this.firstName}} @onChange={{action (mut this.firstName)}} @required={{true}} />
+            <form.input @label="Last Name" @value={{this.lastName}} @onChange={{action (mut this.lastName)}} />
           </div>
           <div class="layout-column flex-50">
-            <form.autocomplete @required={{true}} @options={{items}} @selected={{selectedCountry}} @searchField="name" @labelPath="name" @label="Country" @noMatchesMessage="Oops this country doesn't exist." @onSelectionChange={{action (mut selectedCountry)}} as |country select|>
+            <form.autocomplete @required={{true}} @options={{this.items}} @selected={{this.selectedCountry}} @searchField="name" @labelPath="name" @label="Country" @noMatchesMessage="Oops this country doesn't exist." @onSelectionChange={{action (mut this.selectedCountry)}} as |country select|>
               <PaperAutocompleteHighlight @label={{country.name}} @searchText={{select.searchText}} @flags="i" />
             </form.autocomplete>
-            <form.input @type="number" @label="Age" @value={{age}} @onChange={{action (mut age)}} @min={{13}} @max={{65}} @required={{true}} />
+            <form.input @type="number" @label="Age" @value={{this.age}} @onChange={{action (mut this.age)}} @min={{13}} @max={{65}} @required={{true}} />
           </div>
         </div>
         <div class="layout-row">
@@ -67,7 +67,7 @@
       {{! BEGIN-SNIPPET form.disabled-submit }}
       <PaperForm @onSubmit={{action "disabledSubmitAction"}} as |form|>
         <div class="layout-row">
-          <form.input @label="Favorite Letter" @value={{favoriteLetter}} @onChange={{action (mut favoriteLetter)}} @required={{true}} @maxlength={{1}} />
+          <form.input @label="Favorite Letter" @value={{this.favoriteLetter}} @onChange={{action (mut this.favoriteLetter)}} @required={{true}} @maxlength={{1}} />
         </div>
         <div class="layout-row">
           <form.submit-button @raised={{true}} @primary={{true}} @disabled={{form.isInvalid}}>
@@ -113,7 +113,7 @@
       {{! BEGIN-SNIPPET form.custom-components }}
       <PaperForm @onSubmit={{action "customSubmitAction"}} as |form|>
         <div class="layout-row">
-          <PaperInput @label="Favorite Number" @value={{favoriteNumber}} @onChange={{action (mut favoriteNumber)}} @required={{true}} @min={{1}} @max={{10}} />
+          <PaperInput @label="Favorite Number" @value={{this.favoriteNumber}} @onChange={{action (mut this.favoriteNumber)}} @required={{true}} @min={{1}} @max={{10}} />
         </div>
         <div class="layout-row">
           <form.submit-button @raised={{true}} @primary={{true}}>Submit</form.submit-button>
diff --git a/tests/dummy/app/templates/layout/child-alignment.hbs b/tests/dummy/app/templates/layout/child-alignment.hbs
index 6ca1f7563..b96dcebbd 100644
--- a/tests/dummy/app/templates/layout/child-alignment.hbs
+++ b/tests/dummy/app/templates/layout/child-alignment.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-curly-component-invocation no-implicit-this }}
+{{! template-lint-disable no-action no-curly-component-invocation }}
 <PageToolbar @pageTitle="Child Alignment" @isLayout={{true}} />
 
 <DocContent @class="layout-docs alignment">
@@ -28,14 +28,14 @@
     <PaperToolbar as |toolbar|>
       <toolbar.tools>
         <h2>
-          <span class="layout-class">{{layoutClass}}</span>
-          <span class="layout-align-class">{{layoutAlignClass}}</span>
+          <span class="layout-class">{{this.layoutClass}}</span>
+          <span class="layout-align-class">{{this.layoutAlignClass}}</span>
         </h2>
       </toolbar.tools>
     </PaperToolbar>
     <div class="example interactive-demo">
       {{! BEGIN-SNIPPET child-alignment }}
-      <div class="{{layoutClass}} {{layoutAlignClass}}">
+      <div class="{{this.layoutClass}}{{this.layoutAlignClass}}">
         <div class="one">one</div>
         <div class="two">two</div>
         <div class="three">three</div>
@@ -46,7 +46,7 @@
       <div class="layout-row layout-align-space-between-start">
         <div class="demo-group">
           <h4>Layout Direction</h4>
-          <PaperRadioGroup @groupValue={{layoutDirection}} @onChange={{action (mut layoutDirection)}} as |group|>
+          <PaperRadioGroup @groupValue={{this.layoutDirection}} @onChange={{action (mut this.layoutDirection)}} as |group|>
             <group.radio @value="row">
               row
             </group.radio>
@@ -58,7 +58,7 @@
 
         <div class="demo-group">
           <h4>Alignment in Layout Direction</h4>
-          <PaperRadioGroup @groupValue={{mainDirection}} @onChange={{action (mut mainDirection)}} as |group|>
+          <PaperRadioGroup @groupValue={{this.mainDirection}} @onChange={{action (mut this.mainDirection)}} as |group|>
             <group.radio @value="">
               none
             </group.radio>
@@ -82,7 +82,7 @@
 
         <div class="demo-group">
           <h4>Alignment in Perpendicular Direction</h4>
-          <PaperRadioGroup @groupValue={{perpDirection}} @onChange={{action (mut perpDirection)}} as |group|>
+          <PaperRadioGroup @groupValue={{this.perpDirection}} @onChange={{action (mut this.perpDirection)}} as |group|>
             <group.radio @value="">
               <em>none</em>
             </group.radio>
diff --git a/tests/dummy/app/templates/layout/introduction.hbs b/tests/dummy/app/templates/layout/introduction.hbs
index 4b06e2600..724cf0623 100644
--- a/tests/dummy/app/templates/layout/introduction.hbs
+++ b/tests/dummy/app/templates/layout/introduction.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable link-rel-noopener no-action no-implicit-this }}
+{{! template-lint-disable link-rel-noopener no-action }}
 <PageToolbar @pageTitle="Introduction" @isLayout={{true}} />
 
 <DocContent @class="layout-docs">
@@ -94,10 +94,10 @@
   <PaperCard as |card|>
     {{! BEGIN-SNIPPET layout-introduction }}
     <div class="layout-column example introduction-example">
-      <div class="flex-33 flex-md-{{box1Height}} box-one"></div>
-      <div class="flex-33 layout-{{direction}} layout-md-row box-two">
+      <div class="flex-33 flex-md-{{this.box1Height}} box-one"></div>
+      <div class="flex-33 layout-{{this.direction}} layout-md-row box-two">
         <div class="flex-20 flex-md-10 hide-lg box-two-one"></div>
-        <div class="flex-30 {{if hideBox "hide-md"}} flex-md-25 box-two-two"></div>
+        <div class="flex-30 {{if this.hideBox "hide-md"}} flex-md-25 box-two-two"></div>
         <div class="flex-20 flex-md-65 box-two-three"></div>
       </div>
       <div class="flex box-three"></div>
@@ -106,11 +106,11 @@
     <card.content>
 
       <div class="layout-row layout-align-space-between-start">
-        <PaperInput @value={{box1Height}} @label="box1Height" @type="number" @passThru={{hash min="0" max="100" step="5"}} @onChange={{action (mut box1Height)}} />
+        <PaperInput @value={{this.box1Height}} @label="box1Height" @type="number" @passThru={{hash min="0" max="100" step="5"}} @onChange={{action (mut this.box1Height)}} />
 
         <div class="demo-group">
           <h4>direction</h4>
-          <PaperRadioGroup @groupValue={{direction}} @onChange={{action (mut direction)}} as |group|>
+          <PaperRadioGroup @groupValue={{this.direction}} @onChange={{action (mut this.direction)}} as |group|>
             <group.radio @value="row">
               row
             </group.radio>
@@ -120,7 +120,7 @@
           </PaperRadioGroup>
         </div>
 
-        <PaperSwitch @value={{hideBox}} @onChange={{action (mut hideBox)}}>hideBox</PaperSwitch>
+        <PaperSwitch @value={{this.hideBox}} @onChange={{action (mut this.hideBox)}}>hideBox</PaperSwitch>
       </div>
 
       <CodeSnippet @name="layout-introduction.hbs" />
diff --git a/tests/dummy/app/templates/theme.hbs b/tests/dummy/app/templates/theme.hbs
index 28d2c2a9c..4bd8ab0fb 100644
--- a/tests/dummy/app/templates/theme.hbs
+++ b/tests/dummy/app/templates/theme.hbs
@@ -1,4 +1,4 @@
-{{! template-lint-disable no-action no-implicit-this }}
+{{! template-lint-disable no-action }}
 <PageToolbar @pageTitle="Themes & Colors" @isDemo={{false}} />
 
 <PaperContent @class="md-padding">
@@ -130,22 +130,22 @@
 
     <PaperCard as |card|>
       <card.content @class="layout-row">
-        <PaperSelect @label="Primary palette" @class="flex" @required={{true}} @options={{palettes}} @selected={{primary}} @onChange={{action (mut primary)}} as |p|>
+        <PaperSelect @label="Primary palette" @class="flex" @required={{true}} @options={{this.palettes}} @selected={{this.primary}} @onChange={{action (mut this.primary)}} as |p|>
           {{p.name}}
         </PaperSelect>
 
-        <PaperSelect @label="Accent palette" @class="flex" @required={{true}} @options={{palettes}} @selected={{accent}} @onChange={{action (mut accent)}} as |p|>
+        <PaperSelect @label="Accent palette" @class="flex" @required={{true}} @options={{this.palettes}} @selected={{this.accent}} @onChange={{action (mut this.accent)}} as |p|>
           {{p.name}}
         </PaperSelect>
 
-        <PaperSelect @label="Warn palette" @class="flex" @required={{true}} @options={{palettes}} @selected={{warn}} @onChange={{action (mut warn)}} as |p|>
+        <PaperSelect @label="Warn palette" @class="flex" @required={{true}} @options={{this.palettes}} @selected={{this.warn}} @onChange={{action (mut this.warn)}} as |p|>
           {{p.name}}
         </PaperSelect>
 
       </card.content>
 
       <card.actions>
-        <PaperButton @primary={{true}} @raised={{true}} @disabled={{isInvalid}} @onClick={{action "installTheme"}}>
+        <PaperButton @primary={{true}} @raised={{true}} @disabled={{this.isInvalid}} @onClick={{action "installTheme"}}>
           Install Theme
         </PaperButton>