diff --git a/addon/templates/components/welcome-page.hbs b/addon/templates/components/welcome-page.hbs
index 32ab11a6..01cbdb06 100644
--- a/addon/templates/components/welcome-page.hbs
+++ b/addon/templates/components/welcome-page.hbs
@@ -1,22 +1,22 @@
-<main id="ember-welcome-page-id-selector" data-ember-version="{{emberVersion}}">
+<main id="ember-welcome-page-id-selector" data-ember-version="{{this.emberVersion}}">
   <div class="columns">
     <div class="tomster">
-      <img src="{{rootURL}}ember-welcome-page/images/construction.png" alt="Under construction">
+      <img src="{{this.rootURL}}ember-welcome-page/images/construction.png" alt="Under construction">
     </div>
     <div class="welcome">
       <h1 id="title">Congratulations, you made it!</h1>
 
       <p>You&rsquo;ve officially spun up your Ember app. You&rsquo;ve got one more decision to make: what do you want to do next? We&rsquo;d suggest one of the following to help you get going:</p>
       <ul>
-        <li><a href="https://guides.emberjs.com/{{if isCurrent '' 'v'}}{{emberVersion}}/getting-started/quick-start/">Quick Start</a> - a quick introduction to how Ember works. Learn about defining your first route, writing a UI component and deploying your application.</li>
-        <li><a href="https://guides.emberjs.com/{{if isCurrent '' 'v'}}{{emberVersion}}/tutorial/ember-cli/">Ember Guides</a> - this is our more thorough, hands-on intro to Ember. Your crash course in Ember philosophy, background and some in-depth discussion of how things work (and why they work the way they do).</li>
+        <li><a href="https://guides.emberjs.com/{{if this.isCurrent '' 'v'}}{{this.emberVersion}}/getting-started/quick-start/">Quick Start</a> - a quick introduction to how Ember works. Learn about defining your first route, writing a UI component and deploying your application.</li>
+        <li><a href="https://guides.emberjs.com/{{if this.isCurrent '' 'v'}}{{this.emberVersion}}/tutorial/ember-cli/">Ember Guides</a> - this is our more thorough, hands-on intro to Ember. Your crash course in Ember philosophy, background and some in-depth discussion of how things work (and why they work the way they do).</li>
       </ul>
       <p>If you run into problems, please join <a href="https://discord.gg/emberjs">our community's Discord server</a> or visit <a href="http://discuss.emberjs.com/">our forums</a> for ideas and answers— our community is filled with friendly folks who are willing to help! We enjoy helping new Ember developers get started, and our <a href="https://emberjs.com/community/">Ember Community</a> is incredibly supportive.</p>
     </div>
   </div>
   <p class="postscript">To remove this welcome message, remove the
     <code>
-      {{#if canAngleBracket}}
+      {{#if this.canAngleBracket}}
         &lt;WelcomePage /&gt;
       {{else}}
         \{{welcome-page}}
@@ -24,7 +24,7 @@
     </code>
     component from your
     <code>
-      {{#if isModuleUnification}}
+      {{#if this.isModuleUnification}}
         src/ui/routes/application/template.hbs
       {{else}}
         app/templates/application.hbs