diff --git a/tests/dummy/app/controllers/application.js b/tests/dummy/app/controllers/application.js
index 4085948..c981f29 100644
--- a/tests/dummy/app/controllers/application.js
+++ b/tests/dummy/app/controllers/application.js
@@ -1,17 +1,17 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
-import { set } from '@ember/object';
+import { action, set } from '@ember/object';
 import { alias } from '@ember/object/computed';
 
-export default Controller.extend({
-  cognito: service(),
-  currentUser: service(),
-  session: service(),
-  poolId: alias('cognito.poolId'),
-  clientId: alias('cognito.clientId'),
+export default class ApplicationController extends Controller {
+  @service cognito;
+  @service currentUser;
+  @service session;
+  @alias('cognito.poolId') poolId;
+  @alias('cognito.clientId') clientId;
 
-  init() {
-    this._super(...arguments);
+  constructor() {
+    super(...arguments);
     let poolId = localStorage.getItem('ember-cognito/dummy/poolId');
     let clientId = localStorage.getItem('ember-cognito/dummy/clientId');
     // Ignore the defaults, which are used to test the configuration in unit tests
@@ -22,17 +22,17 @@ export default Controller.extend({
     }
     set(this, 'poolId', poolId);
     set(this, 'clientId', clientId);
-  },
+  }
 
-  actions: {
-    saveIds(e) {
-      e.preventDefault();
-      localStorage.setItem('ember-cognito/dummy/poolId', this.poolId);
-      localStorage.setItem('ember-cognito/dummy/clientId', this.clientId);
-    },
+  @action
+  saveIds(e) {
+    e.preventDefault();
+    localStorage.setItem('ember-cognito/dummy/poolId', this.poolId);
+    localStorage.setItem('ember-cognito/dummy/clientId', this.clientId);
+  }
 
-    logout() {
-      this.session.invalidate();
-    }
+  @action
+  logout() {
+    this.session.invalidate();
   }
-});
+}
diff --git a/tests/dummy/app/templates/application.hbs b/tests/dummy/app/templates/application.hbs
index 9876147..c1997cf 100644
--- a/tests/dummy/app/templates/application.hbs
+++ b/tests/dummy/app/templates/application.hbs
@@ -1,8 +1,8 @@
 <nav class="navbar navbar-light navbar-expand bg-light">
-  {{#link-to "index" class="navbar-brand"}}ember-cognito{{/link-to}}
+  <LinkTo @route="index" class="navbar-brand">ember-cognito</LinkTo>
 
   <div class="collapse navbar-collapse">
-    <form class="form-inline ml-auto" onsubmit={{action "saveIds"}}>
+    <form class="form-inline ml-auto" {{on "submit" (fn this.saveIds)}}>
       <label for="pool_id" class="sr-only">Cognito Pool ID</label>
       <input
         id="pool_id"
@@ -27,8 +27,8 @@
       {{#if this.session.isAuthenticated}}
         <li class="nav-item"><a href="#" class="logout-link" onclick={{action "logout"}}>Logout</a></li>
       {{else}}
-        <li class="nav-item">{{#link-to "login" class="nav-link login-link"}}Login{{/link-to}}</li>
-        <li class="nav-item">{{#link-to "register" class="nav-link register-link"}}Register{{/link-to}}</li>
+        <li class="nav-item"><LinkTo @route="login" class="nav-link login-link">Login</LinkTo></li>
+        <li class="nav-item"><LinkTo @route="register" class="nav-link register-link">Register</LinkTo></li>
       {{/if}}
     </ul>
   </div>
diff --git a/tests/dummy/app/templates/attribute-verify.hbs b/tests/dummy/app/templates/attribute-verify.hbs
index cd17a27..67ec101 100644
--- a/tests/dummy/app/templates/attribute-verify.hbs
+++ b/tests/dummy/app/templates/attribute-verify.hbs
@@ -1,3 +1,4 @@
-{{attribute-verify-route
-  name=this.name
-  onComplete=(action (transition-to-route this "index"))}}
+<AttributeVerifyRoute
+  @name={{this.name}}
+  @onComplete={{fn (transition-to-route this "index")}}
+/>
diff --git a/tests/dummy/app/templates/attribute.hbs b/tests/dummy/app/templates/attribute.hbs
index b500360..08ceeef 100644
--- a/tests/dummy/app/templates/attribute.hbs
+++ b/tests/dummy/app/templates/attribute.hbs
@@ -1,4 +1,5 @@
-{{attribute-route
-  model=this.model
-  onSave=(action (transition-to-route this "index"))
-  onDelete=(action (transition-to-route this "index"))}}
+<AttributeRoute
+  @model={{this.model}}
+  @onSave={{fn (transition-to-route this "index")}}
+  @onDelete={{fn (transition-to-route this "index")}}
+/>
diff --git a/tests/dummy/app/templates/change-password.hbs b/tests/dummy/app/templates/change-password.hbs
index 4668595..bfb4e07 100644
--- a/tests/dummy/app/templates/change-password.hbs
+++ b/tests/dummy/app/templates/change-password.hbs
@@ -1,2 +1,3 @@
-{{change-password-route
-  onComplete=(action (transition-to-route this "index"))}}
+<ChangePasswordRoute
+  @onComplete={{fn (transition-to-route this "index")}}
+/>
diff --git a/tests/dummy/app/templates/components/attribute-route.hbs b/tests/dummy/app/templates/components/attribute-route.hbs
index 187b19c..69807bc 100644
--- a/tests/dummy/app/templates/components/attribute-route.hbs
+++ b/tests/dummy/app/templates/components/attribute-route.hbs
@@ -13,25 +13,25 @@
         {{/if}}
         <div class="form-group">
           <label for="name">Name</label>
-          {{input
-            value=this.model.name
+          <Input
+            @value={{this.model.name}}
             class="form-control"
-            id="name"
-            autofocus=true
-            required=true
-          }}
+            @id="name"
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="value">Value</label>
-          {{input
-            value=this.model.value
+          <Input
+            @value={{this.model.value}}
             class="form-control"
-            id="value"
-            required=true
-          }}
+            @id="value"
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Save</button>
-        <button class="btn btn-danger" onclick={{action "deleteAttr"}}>Delete</button>
+        <button class="btn btn-danger" onclick={{action "deleteAttr"}} type="button">Delete</button>
       </form>
     </div>
   </div>
diff --git a/tests/dummy/app/templates/components/attribute-verify-route.hbs b/tests/dummy/app/templates/components/attribute-verify-route.hbs
index 2de1fe5..90c9a07 100644
--- a/tests/dummy/app/templates/components/attribute-verify-route.hbs
+++ b/tests/dummy/app/templates/components/attribute-verify-route.hbs
@@ -1,20 +1,20 @@
 <div class="container">
   <div class="row">
     <div class="col-4">
-      <h1>Verify {{name}}</h1>
+      <h1>Verify {{@name}}</h1>
       <form class="verify-attribute-form" onsubmit={{action "verifyAttribute"}}>
         {{#if this.errorMessage}}
           <div class="alert alert-danger">{{this.errorMessage}}</div>
         {{/if}}
         <div class="form-group">
           <label for="code">Verification Code</label>
-          {{input
-            value=this.code
+          <Input
+            @value={{this.code}}
             class="form-control"
-            id="code"
+            @id="code"
             placeholder="123456"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Verify</button>
       </form>
diff --git a/tests/dummy/app/templates/components/change-password-route.hbs b/tests/dummy/app/templates/components/change-password-route.hbs
index 8d9eb01..c3d9329 100644
--- a/tests/dummy/app/templates/components/change-password-route.hbs
+++ b/tests/dummy/app/templates/components/change-password-route.hbs
@@ -8,24 +8,24 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Old Password</label>
-          {{input
-            value=this.oldPassword
-            type="password"
+          <Input
+            @value={{this.oldPassword}}
+            @type="password"
             class="form-control"
-            id="username"
-            autofocus=true
-            required=true
-          }}
+            @id="username"
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="code">New Password</label>
-          {{input
-            value=this.newPassword
-            type="password"
+          <Input
+            @value={{this.newPassword}}
+            @type="password"
             class="form-control"
-            id="code"
-            required=true
-          }}
+            @id="code"
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Reset Password</button>
       </form>
diff --git a/tests/dummy/app/templates/components/delete-user-route.hbs b/tests/dummy/app/templates/components/delete-user-route.hbs
index dcb781f..3fdb607 100644
--- a/tests/dummy/app/templates/components/delete-user-route.hbs
+++ b/tests/dummy/app/templates/components/delete-user-route.hbs
@@ -10,16 +10,16 @@
         {{/if}}
         <div class="form-group">
           <label for="delete">Delete</label>
-          {{input
-            value=this.deleteVal
+          <Input
+            @value={{this.deleteVal}}
             class="form-control"
-            id="delete"
-            autofocus=true
-            required=true
-          }}
+            @id="delete"
+            autofocus
+            required
+          />
         </div>
         <button type="submit" class="btn btn-danger">Delete User</button>
-        {{#link-to "index" class="btn btn-info ml-auto"}}Go back{{/link-to}}
+        <LinkTo @route="index" class="btn btn-info ml-auto">Go back</LinkTo>
       </form>
     </div>
   </div>
diff --git a/tests/dummy/app/templates/components/forgot-password-confirm-route.hbs b/tests/dummy/app/templates/components/forgot-password-confirm-route.hbs
index e77b037..23412ee 100644
--- a/tests/dummy/app/templates/components/forgot-password-confirm-route.hbs
+++ b/tests/dummy/app/templates/components/forgot-password-confirm-route.hbs
@@ -8,35 +8,35 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="code">Code</label>
-          {{input
-            value=this.code
+          <Input
+            @value={{this.code}}
             class="form-control"
-            id="code"
+            @id="code"
             placeholder="123456"
-            required=true
-          }}
+            required
+          />
         </div>
         <div class="form-group">
           <label for="password">New Password</label>
-          {{input
-            value=this.password
-            type="password"
+          <Input
+            @value={{this.password}}
+            @type="password"
             class="form-control"
-            id="password"
+            @id="password"
             placeholder="Password"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Reset Password</button>
       </form>
diff --git a/tests/dummy/app/templates/components/forgot-password-index-route.hbs b/tests/dummy/app/templates/components/forgot-password-index-route.hbs
index a214fae..70f7c67 100644
--- a/tests/dummy/app/templates/components/forgot-password-index-route.hbs
+++ b/tests/dummy/app/templates/components/forgot-password-index-route.hbs
@@ -8,14 +8,14 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Send code</button>
       </form>
diff --git a/tests/dummy/app/templates/components/index-auth.hbs b/tests/dummy/app/templates/components/index-auth.hbs
index c5fe248..ca56ea8 100644
--- a/tests/dummy/app/templates/components/index-auth.hbs
+++ b/tests/dummy/app/templates/components/index-auth.hbs
@@ -14,40 +14,40 @@
         </tr>
       </thead>
       <tbody>
-        {{#each model.attributes as |attr|}}
+        {{#each @model.attributes as |attr|}}
           <tr>
             <td>{{attr.name}}</td>
             <td>{{attr.value}}</td>
             <td>
-              {{#link-to "attribute" (query-params name=attr.name)}}
+              <LinkTo @route="attribute" @query={{hash name=attr.name}}>
                 Edit
-              {{/link-to}}
+              </LinkTo>
             </td>
           </tr>
         {{/each}}
       </tbody>
     </table>
-    {{#link-to "attribute" (query-params name=undefined) class="btn btn-light btn-block"}}
+    <LinkTo @route="attribute" @query={{hash name=undefined}} class="btn btn-light btn-block">
       Add attribute
-    {{/link-to}}
+    </LinkTo>
     {{#unless this.emailVerified}}
-      <button class="btn btn-light btn-block" onclick={{action "verifyAttribute" "email"}}>
+      <button class="btn btn-light btn-block" onclick={{action "verifyAttribute" "email"}} type="button">
         Verify email
       </button>
     {{/unless}}
-    {{#unless this.phonenNumberVerified}}
-      <button class="btn btn-light btn-block" onclick={{action "verifyAttribute" "phone_number"}}>
+    {{#unless this.phoneNumberVerified}}
+      <button class="btn btn-light btn-block" onclick={{action "verifyAttribute" "phone_number"}} type="button">
         Verify phone number
       </button>
     {{/unless}}
 
     <h2 class="mt-4">Actions</h2>
-    {{#link-to "change-password" class="btn btn-light btn-block"}}
+    <LinkTo @route="change-password" class="btn btn-light btn-block">
       Change password
-    {{/link-to}}
-    {{#link-to "delete-user" class="btn btn-outline-danger btn-block mt-3"}}
+    </LinkTo>
+    <LinkTo @route="delete-user" class="btn btn-outline-danger btn-block mt-3">
       Delete user
-    {{/link-to}}
+    </LinkTo>
   </div>
 
   <div class="col-6">
diff --git a/tests/dummy/app/templates/components/index-unauth.hbs b/tests/dummy/app/templates/components/index-unauth.hbs
index 1ab9768..9f5cae4 100644
--- a/tests/dummy/app/templates/components/index-unauth.hbs
+++ b/tests/dummy/app/templates/components/index-unauth.hbs
@@ -5,8 +5,8 @@
       <li>Add your Cognito Pool ID and Client ID in the header above.</li>
       <li>Click <b>Save</b> to save this to local storage.</li>
       <li>
-        Click {{#link-to "login"}}Login{{/link-to}} to login with an existing user or
-        {{#link-to "register"}}Register{{/link-to}} to create a new user.
+        Click <LinkTo @route="login">Login</LinkTo> to login with an existing user or
+        <LinkTo @route="register">Register</LinkTo> to create a new user.
       </li>
     </ol>
   </div>
diff --git a/tests/dummy/app/templates/components/login-index-route.hbs b/tests/dummy/app/templates/components/login-index-route.hbs
index e41b1cf..d7620c6 100644
--- a/tests/dummy/app/templates/components/login-index-route.hbs
+++ b/tests/dummy/app/templates/components/login-index-route.hbs
@@ -8,28 +8,28 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="password">Password</label>
-          {{input
-            value=this.password
-            type="password"
+          <Input
+            @value={{this.password}}
+            @type="password"
             class="form-control"
-            id="password"
+            @id="password"
             placeholder="Password"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Login</button>
-        {{#link-to "forgot-password.index" class="btn btn-link"}}Forgot password{{/link-to}}
+        <LinkTo @route="forgot-password.index" class="btn btn-link">Forgot password</LinkTo>
       </form>
     </div>
   </div>
diff --git a/tests/dummy/app/templates/components/login-new-password-route.hbs b/tests/dummy/app/templates/components/login-new-password-route.hbs
index 0ca0c6e..b0c3a67 100644
--- a/tests/dummy/app/templates/components/login-new-password-route.hbs
+++ b/tests/dummy/app/templates/components/login-new-password-route.hbs
@@ -9,14 +9,14 @@
         <p>Please enter a new password.</p>
         <div class="form-group">
           <label for="password">Password</label>
-          {{input
-            value=this.password
-            type="password"
+          <Input
+            @value={{this.password}}
+            @type="password"
             class="form-control"
-            id="password"
+            @id="password"
             placeholder="Password"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Set password</button>
       </form>
diff --git a/tests/dummy/app/templates/components/register-confirm-route.hbs b/tests/dummy/app/templates/components/register-confirm-route.hbs
index 3dad9fa..aaacdf6 100644
--- a/tests/dummy/app/templates/components/register-confirm-route.hbs
+++ b/tests/dummy/app/templates/components/register-confirm-route.hbs
@@ -8,27 +8,27 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="code">Code</label>
-          {{input
-            value=this.code
+          <Input
+            @value={{this.code}}
             class="form-control"
-            id="code"
+            @id="code"
             placeholder="123456"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Confirm</button>
-        {{#link-to "register.resend" class="btn btn-link"}}Resend confirmation code{{/link-to}}
+        <LinkTo @route="register.resend" class="btn btn-link">Resend confirmation code</LinkTo>
       </form>
     </div>
   </div>
diff --git a/tests/dummy/app/templates/components/register-index-route.hbs b/tests/dummy/app/templates/components/register-index-route.hbs
index 7138dd1..d67ea10 100644
--- a/tests/dummy/app/templates/components/register-index-route.hbs
+++ b/tests/dummy/app/templates/components/register-index-route.hbs
@@ -9,43 +9,45 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <div class="form-group">
           <label for="email_address">Email address</label>
-          {{input
-            value=this.email
+          <Input
+            @value={{this.email}}
+            @type="email"
             class="form-control"
-            id="email_address"
+            @id="email_address"
             placeholder="email@example.com"
-          }}
+          />
         </div>
         <div class="form-group">
           <label for="phone">Phone number</label>
-          {{input
-            value=this.phone
+          <Input
+            @value={{this.phone}}
+            @type="tel"
             class="form-control"
-            id="phone"
+            @id="phone"
             placeholder="+18885551212"
-          }}
+          />
         </div>
         <div class="form-group">
           <label for="password">Password</label>
-          {{input
-            value=this.password
-            type="password"
+          <Input
+            @value={{this.password}}
+            @type="password"
             class="form-control"
-            id="password"
+            @id="password"
             placeholder="Password"
-            required=true
-          }}
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Register</button>
       </form>
diff --git a/tests/dummy/app/templates/components/register-resend-route.hbs b/tests/dummy/app/templates/components/register-resend-route.hbs
index ac8f021..2d79e9a 100644
--- a/tests/dummy/app/templates/components/register-resend-route.hbs
+++ b/tests/dummy/app/templates/components/register-resend-route.hbs
@@ -8,14 +8,14 @@
         {{/if}}
         <div class="form-group">
           <label for="username">Username</label>
-          {{input
-            value=this.username
+          <Input
+            @value={{this.username}}
             class="form-control"
-            id="username"
+            @id="username"
             placeholder="Username"
-            autofocus=true
-            required=true
-          }}
+            autofocus
+            required
+          />
         </div>
         <button type="submit" class="btn btn-primary">Resend</button>
       </form>
diff --git a/tests/dummy/app/templates/delete-user.hbs b/tests/dummy/app/templates/delete-user.hbs
index 1aefa20..9c58b64 100644
--- a/tests/dummy/app/templates/delete-user.hbs
+++ b/tests/dummy/app/templates/delete-user.hbs
@@ -1,2 +1,3 @@
-{{delete-user-route
-  onComplete=(action (transition-to-route this "index"))}}
+<DeleteUserRoute
+  @onComplete={{fn (transition-to-route this "index")}}
+/>
diff --git a/tests/dummy/app/templates/forgot-password/confirm.hbs b/tests/dummy/app/templates/forgot-password/confirm.hbs
index da36c54..35849d7 100644
--- a/tests/dummy/app/templates/forgot-password/confirm.hbs
+++ b/tests/dummy/app/templates/forgot-password/confirm.hbs
@@ -1,2 +1,3 @@
-{{forgot-password-confirm-route
-  onComplete=(action (transition-to-route this "login"))}}
+<ForgotPasswordConfirmRoute
+  @onComplete={{fn (transition-to-route this "login")}}
+/>
diff --git a/tests/dummy/app/templates/forgot-password/index.hbs b/tests/dummy/app/templates/forgot-password/index.hbs
index c7e36a5..38a6b1e 100644
--- a/tests/dummy/app/templates/forgot-password/index.hbs
+++ b/tests/dummy/app/templates/forgot-password/index.hbs
@@ -1,2 +1,3 @@
-{{forgot-password-index-route
-  onComplete=(action (transition-to-route this "forgot-password.confirm"))}}
+<ForgotPasswordIndexRoute
+  @onComplete={{fn (transition-to-route this "forgot-password.confirm")}}
+/>
diff --git a/tests/dummy/app/templates/index.hbs b/tests/dummy/app/templates/index.hbs
index 99a4f76..61ec544 100644
--- a/tests/dummy/app/templates/index.hbs
+++ b/tests/dummy/app/templates/index.hbs
@@ -4,8 +4,8 @@
     <h2>Amazon Cognito and ember-simple-auth integration</h2>
   </div>
   {{#if this.session.isAuthenticated}}
-    {{index-auth model=this.model}}
+    <IndexAuth @model={{this.model}} />
   {{else}}
-    {{index-unauth model=this.model}}
+    <IndexUnauth @model={{this.model}} />
   {{/if}}
 </div>
diff --git a/tests/dummy/app/templates/login/index.hbs b/tests/dummy/app/templates/login/index.hbs
index 1db26ac..33681cc 100644
--- a/tests/dummy/app/templates/login/index.hbs
+++ b/tests/dummy/app/templates/login/index.hbs
@@ -1,2 +1,3 @@
-{{login-index-route
-  onNewPasswordRequired=(action (transition-to-route this "login.new-password"))}}
+<LoginIndexRoute
+  @onNewPasswordRequired={{fn (transition-to-route this "login.new-password")}}
+/>
diff --git a/tests/dummy/app/templates/login/new-password.hbs b/tests/dummy/app/templates/login/new-password.hbs
index deb1728..6b9c54e 100644
--- a/tests/dummy/app/templates/login/new-password.hbs
+++ b/tests/dummy/app/templates/login/new-password.hbs
@@ -1 +1 @@
-{{login-new-password-route model=this.model}}
\ No newline at end of file
+<LoginNewPasswordRoute @model={{this.model}} />
\ No newline at end of file
diff --git a/tests/dummy/app/templates/register/confirm.hbs b/tests/dummy/app/templates/register/confirm.hbs
index fbfa9f5..1389a58 100644
--- a/tests/dummy/app/templates/register/confirm.hbs
+++ b/tests/dummy/app/templates/register/confirm.hbs
@@ -1,2 +1,3 @@
-{{register-confirm-route
-  onComplete=(action (transition-to-route this "login"))}}
+<RegisterConfirmRoute
+  @onComplete={{fn (transition-to-route this "login")}}
+/>
diff --git a/tests/dummy/app/templates/register/index.hbs b/tests/dummy/app/templates/register/index.hbs
index 20e941e..925f64d 100644
--- a/tests/dummy/app/templates/register/index.hbs
+++ b/tests/dummy/app/templates/register/index.hbs
@@ -1,4 +1,4 @@
-{{register-index-route
-  onComplete=(action (transition-to-route this "index"))
-  onConfirmationRequired=(action (transition-to-route this "register.confirm"))
-}}
+<RegisterIndexRoute
+  @onComplete={{fn (transition-to-route this "index")}}
+  @onConfirmationRequired={{fn (transition-to-route this "register.confirm")}}
+/>
diff --git a/tests/dummy/app/templates/register/resend.hbs b/tests/dummy/app/templates/register/resend.hbs
index 896d87c..b5cc3f4 100644
--- a/tests/dummy/app/templates/register/resend.hbs
+++ b/tests/dummy/app/templates/register/resend.hbs
@@ -1,2 +1,3 @@
-{{register-resend-route
-  onComplete=(action (transition-to-route this "register.confirm"))}}
+<RegisterResendRoute
+  @onComplete={{fn (transition-to-route this "register.confirm")}}
+/>