diff --git a/package.json b/package.json
index 90881162..c914d752 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "babel-eslint": "^10.1.0",
     "bootstrap": "~3.3.5",
     "broccoli-asset-rev": "^3.0.0",
+    "ember-angle-bracket-invocation-polyfill": "^3.0.1",
     "ember-cli": "~3.28.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
diff --git a/tests/dummy/app/routes/application/template.hbs b/tests/dummy/app/routes/application/template.hbs
index 44c2bb56..394113ea 100644
--- a/tests/dummy/app/routes/application/template.hbs
+++ b/tests/dummy/app/routes/application/template.hbs
@@ -1,12 +1,14 @@
 <header class="container-fluid">
   <div class="row">
-    {{#link-to "index" tagName="h1" class="col-sm-6"}}
-      <img alt="HTML Next Logo" src="./HTML-Next.png" style="height: 2em;">
-      Vertical Collection
-    {{/link-to}}
+    <h1 class="col-sm-6">
+      <LinkTo @route="index">
+        <img alt="HTML Next Logo" src="./HTML-Next.png" style="height: 2em;">
+        Vertical Collection
+      </LinkTo>
+    </h1>
     <nav class="col-sm-6 text-small text-right">
-      {{#link-to "examples"}}Demos{{/link-to}}
-      {{#link-to "settings"}}Settings{{/link-to}}
+      <LinkTo @route="examples">Demos</LinkTo>
+      <LinkTo @route="settings">Settings</LinkTo>
     </nav>
   </div>
 </header>
diff --git a/tests/dummy/app/routes/examples/index/template.hbs b/tests/dummy/app/routes/examples/index/template.hbs
index 12beabdc..86579c8a 100644
--- a/tests/dummy/app/routes/examples/index/template.hbs
+++ b/tests/dummy/app/routes/examples/index/template.hbs
@@ -4,17 +4,17 @@
     <div class="col-sm-4">
       <ul>
         <li>
-          {{#link-to "examples.dbmon"}}dbMon{{/link-to}}
+          <LinkTo @route="examples.dbmon">dbMon</LinkTo>
         </li>
         <li>
-          {{#link-to "examples.infinite-scroll"}}Infinite Scroll{{/link-to}}
+          <LinkTo @route="examples.infinite-scroll">Infinite Scroll</LinkTo>
         </li>
         <li>
-          {{#link-to "examples.flexible-layout"}}Flexible Layout{{/link-to}}
+          <LinkTo @route="examples.flexible-layout">Flexible Layout</LinkTo>
         </li>
 
         <li>
-          {{#link-to "examples.scrollable-body"}}Scrollable Body{{/link-to}}
+          <LinkTo @route="examples.scrollable-body">Scrollable Body</LinkTo>
         </li>
       </ul>
     </div>
diff --git a/yarn.lock b/yarn.lock
index 5e3ba5d7..837bec8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4312,6 +4312,16 @@ electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.896:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.12.tgz#5f73d1278c6205fc41d7a0ebd75563046b77c5d8"
   integrity sha512-zjfhG9Us/hIy8AlQ5OzfbR/C4aBv1Dg/ak4GX35CELYlJ4tDAtoEcQivXvyBdqdNQ+R6PhlgQqV8UNPJmhkJog==
 
+ember-angle-bracket-invocation-polyfill@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ember-angle-bracket-invocation-polyfill/-/ember-angle-bracket-invocation-polyfill-3.0.1.tgz#d346692bd75489e49af95e6727b2817d839f7f22"
+  integrity sha512-zxG6yazA7X9+itp3rir+aK6h+NDRJ/COgFmMWgY+Ol8z81MVj5+tgB4ZXDz7e8cCM0S6cUwv82rC6Bb/P7K0ow==
+  dependencies:
+    ember-cli-babel "^7.0.0"
+    ember-cli-version-checker "^2.1.2"
+    ember-compatibility-helpers "^1.0.2"
+    silent-error "^1.1.1"
+
 ember-assign-polyfill@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/ember-assign-polyfill/-/ember-assign-polyfill-2.7.2.tgz#58f6f60235126cb23df248c846008fa9a3245fc1"
@@ -4344,7 +4354,7 @@ ember-cli-babel@^6.16.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.1.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.0, ember-cli-babel@^7.8.0:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.0, ember-cli-babel@^7.11.0, ember-cli-babel@^7.12.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.20.5, ember-cli-babel@^7.26.2, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.0, ember-cli-babel@^7.8.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -4718,7 +4728,7 @@ ember-code-snippet@^2.4.1:
     es6-promise "^1.0.0"
     glob "^7.1.3"
 
-ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.2.1:
+ember-compatibility-helpers@^1.0.2, ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.2.1:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.5.tgz#b8363b1d5b8725afa9a4fe2b2986ac28626c6f23"
   integrity sha512-7cddkQQp8Rs2Mqrj0xqZ0uO7eC9tBCKyZNcP2iE1RxQqOGPv8fiPkj1TUeidUB/Qe80lstoVXWMEuqqhW7Yy9A==