diff --git a/assets/scripts/app/templates/builds/list.hbs b/assets/scripts/app/templates/builds/list.hbs
index 51547030..5d73ca69 100644
--- a/assets/scripts/app/templates/builds/list.hbs
+++ b/assets/scripts/app/templates/builds/list.hbs
@@ -26,9 +26,9 @@
           <td class="number">
             <span class="status"></span>
             {{#if id}}
-              {{#linkTo "build" repo this}}
+              {{#link-to "build" repo this}}
                 {{number}}
-              {{/linkTo}}
+              {{/link-to}}
             {{/if}}
           </td>
           <td class="message">
diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index 37f2f1f0..7c3d8f81 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -8,7 +8,7 @@
         <span class="status"></span>
         {{#if build.id}}
           {{#if build.repo.slug}}
-            {{#linkTo "build" repo build}}{{build.number}}{{/linkTo}}
+            {{#link-to "build" repo build}}{{build.number}}{{/link-to}}
           {{/if}}
         {{/if}}
       </dd>
diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs
index 591d55ea..22314a35 100644
--- a/assets/scripts/app/templates/jobs/list.hbs
+++ b/assets/scripts/app/templates/jobs/list.hbs
@@ -25,7 +25,7 @@
             <span class="status"></span>
             {{#if job.id}}
               {{#if job.repo.slug}}
-                {{#linkTo "job" repo job}}{{number}}{{/linkTo}}
+                {{#link-to "job" repo job}}{{number}}{{/link-to}}
               {{/if}}
             {{/if}}
           </td>
diff --git a/assets/scripts/app/templates/jobs/show.hbs b/assets/scripts/app/templates/jobs/show.hbs
index 06051c7b..0d3bd35e 100644
--- a/assets/scripts/app/templates/jobs/show.hbs
+++ b/assets/scripts/app/templates/jobs/show.hbs
@@ -7,7 +7,7 @@
           <span class="status"></span>
           {{#if job.id}}
             {{#if job.repo.slug}}
-              {{#linkTo "job" repo job}}{{job.number}}{{/linkTo}}
+              {{#link-to "job" repo job}}{{job.number}}{{/link-to}}
             {{/if}}
           {{/if}}
         </dd>
diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs
index d7085cce..0f583cf6 100644
--- a/assets/scripts/app/templates/layouts/top.hbs
+++ b/assets/scripts/app/templates/layouts/top.hbs
@@ -1,10 +1,10 @@
-{{#linkTo "index.current"}}
+{{#link-to "index.current"}}
   <h1>Travis</h1>
-{{/linkTo}}
+{{/link-to}}
 
 <ul id="navigation">
   <li class="home">
-    {{#linkTo "index.current"}}{{t layouts.top.home}}{{/linkTo}}
+    {{#link-to "index.current"}}{{t layouts.top.home}}{{/link-to}}
   </li>
   <li>
     <a href="http://about.travis-ci.org/blog">{{t layouts.top.blog}}</a>
@@ -35,7 +35,7 @@
         <a class="signed-out" href="#" {{action "signIn" target="Travis"}}>{{t layouts.top.github_login}}</a>
       {{/if}}
       {{#if signedIn}}
-        {{#linkTo "profile" class="signed-in"}}<img {{bind-attr src="gravatarUrl"}}/>{{userName}}{{/linkTo}}
+        {{#link-to "profile" class="signed-in"}}<img {{bind-attr src="gravatarUrl"}}/>{{userName}}{{/link-to}}
       {{/if}}
       {{#if signingIn}}
         <span class="signing-in">{{t layouts.top.signing_in}}</span>
@@ -43,7 +43,7 @@
     </p>
     <ul>
       <li>
-        {{#linkTo "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/linkTo}}
+        {{#link-to "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/link-to}}
       </li>
       <li>
         <a href="/" {{action "signOut" target="Travis"}}>{{t layouts.top.sign_out}}</a>
diff --git a/assets/scripts/app/templates/no_owned_repos.hbs b/assets/scripts/app/templates/no_owned_repos.hbs
index ca925208..534f3481 100644
--- a/assets/scripts/app/templates/no_owned_repos.hbs
+++ b/assets/scripts/app/templates/no_owned_repos.hbs
@@ -11,7 +11,7 @@
     <div class="column-right">
       <span class="steps">Step 1: &nbsp; Enabling your projects</span>
       <p>
-        Start by going to your {{#linkTo "profile.index"}}profile{{/linkTo}} and enable one of your projects. We've been
+        Start by going to your {{#link-to "profile.index"}}profile{{/link-to}} and enable one of your projects. We've been
         synchronizing all repositories you have administrative access to. Pick one and flip the switch next to it.
       </p>
     </div>
diff --git a/assets/scripts/app/templates/profile/accounts.hbs b/assets/scripts/app/templates/profile/accounts.hbs
index c58f4ae0..09c3a2df 100644
--- a/assets/scripts/app/templates/profile/accounts.hbs
+++ b/assets/scripts/app/templates/profile/accounts.hbs
@@ -9,7 +9,7 @@
 
 <div class="tab">
   {{#collection Travis.AccountsListView contentBinding="controller"}}
-    {{#linkTo "account.index" view.account class="name"}}{{view.name}}{{/linkTo}}
+    {{#link-to "account.index" view.account class="name"}}{{view.name}}{{/link-to}}
     <p class="summary">
       <span class="repos_label">Repositories:</span>
       <abbr class="repos">{{view.account.reposCount}}</abbr>
diff --git a/assets/scripts/app/templates/profile/tabs.hbs b/assets/scripts/app/templates/profile/tabs.hbs
index 9ded1ba0..6afb10c8 100644
--- a/assets/scripts/app/templates/profile/tabs.hbs
+++ b/assets/scripts/app/templates/profile/tabs.hbs
@@ -3,7 +3,7 @@
     <h5>
       {{#with view.account}}
         {{#if login}}
-          {{#linkTo "account.index" this}}Repositories{{/linkTo}}
+          {{#link-to "account.index" this}}Repositories{{/link-to}}
         {{/if}}
       {{/with}}
     </h5>
@@ -11,7 +11,7 @@
   {{#if view.displayUser}}
     <li id="tab_user" {{bind-attr class="view.classUser"}}>
       <h5>
-        {{#linkTo "account.profile" view.account}}Profile{{/linkTo}}
+        {{#link-to "account.profile" view.account}}Profile{{/link-to}}
       </h5>
     </li>
   {{/if}}
diff --git a/assets/scripts/app/templates/queues/list.hbs b/assets/scripts/app/templates/queues/list.hbs
index d781c586..b652c221 100644
--- a/assets/scripts/app/templates/queues/list.hbs
+++ b/assets/scripts/app/templates/queues/list.hbs
@@ -6,12 +6,12 @@
       {{#each job in queue}}
         {{#view Travis.QueueItemView jobBinding="job"}}
           {{#if job.repo.slug}}
-            {{#linkTo "job" job.repo job}}
+            {{#link-to "job" job.repo job}}
               <span class="slug">
                 {{job.repo.slug}}
               </span>
               #{{job.number}}
-            {{/linkTo}}
+            {{/link-to}}
           {{/if}}
         {{/view}}
       {{else}}
diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index ddbfe251..09e0cdd9 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -11,12 +11,12 @@
         <div class="slug-and-status">
           <span class="status"></span>
           {{#if slug}}
-            {{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}}
+            {{#link-to "repo" this class="slug"}}{{slug}}{{/link-to}}
           {{/if}}
         </div>
         {{#with lastBuildHash}}
           {{#if repo.slug}}
-            {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}}
+            {{#link-to "build" repo id class="last_build"}}{{number}}{{/link-to}}
           {{/if}}
         {{/with}}
 
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 5addbe79..c1bf53b9 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -5,7 +5,7 @@
     {{#if repo.isLoaded}}
       {{#with repo}}
         <div id="repo-header">
-          <h3>{{#linkTo "repo" this}}{{slug}}{{/linkTo}}</h3>
+          <h3>{{#link-to "repo" this}}{{slug}}{{/link-to}}</h3>
           <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.png" width="21" height="21"/></a></div>
           {{view Travis.RepoShowToolsView}}
         </div>
diff --git a/assets/scripts/app/templates/repos/show/tabs.hbs b/assets/scripts/app/templates/repos/show/tabs.hbs
index 2b3ef740..e94d49e3 100644
--- a/assets/scripts/app/templates/repos/show/tabs.hbs
+++ b/assets/scripts/app/templates/repos/show/tabs.hbs
@@ -2,36 +2,36 @@
   <li id="tab_current" {{bind-attr class="view.classCurrent"}}>
     <h5>
       {{#if repo.slug}}
-        {{#linkTo "repo" repo currentWhen="repo.index"}}
+        {{#link-to "repo" repo currentWhen="repo.index"}}
           {{t repositories.tabs.current}}
-        {{/linkTo}}
+        {{/link-to}}
       {{/if}}
     </h5>
   </li>
   <li id="tab_builds" {{bind-attr class="view.classBuilds"}}>
     <h5>
       {{#if repo.slug}}
-        {{#linkTo "builds" repo}}
+        {{#link-to "builds" repo}}
           {{t repositories.tabs.build_history}}
-        {{/linkTo}}
+        {{/link-to}}
       {{/if}}
     </h5>
   </li>
   <li id="tab_pull_requests" {{bind-attr class="view.classPullRequests"}}>
     <h5>
       {{#if repo.slug}}
-        {{#linkTo "pullRequests" repo}}
+        {{#link-to "pullRequests" repo}}
           {{t repositories.tabs.pull_requests}}
-        {{/linkTo}}
+        {{/link-to}}
       {{/if}}
     </h5>
   </li>
   <li id="tab_branches" {{bind-attr class="view.classBranches"}}>
     <h5>
       {{#if repo.slug}}
-        {{#linkTo "branches" repo}}
+        {{#link-to "branches" repo}}
           {{t repositories.tabs.branches}}
-        {{/linkTo}}
+        {{/link-to}}
       {{/if}}
     </h5>
   </li>
@@ -39,9 +39,9 @@
     <h5>
       {{#if build.id}}
         {{#if repo.slug}}
-          {{#linkTo "build" repo build}}
+          {{#link-to "build" repo build}}
             {{t repositories.tabs.build}} #{{build.number}}
-          {{/linkTo}}
+          {{/link-to}}
         {{/if}}
       {{/if}}
     </h5>
@@ -50,9 +50,9 @@
     <h5>
       {{#if job.id}}
         {{#if repo.slug}}
-          {{#linkTo "job" repo job}}
+          {{#link-to "job" repo job}}
             {{t repositories.tabs.job}} #{{job.number}}
-          {{/linkTo}}
+          {{/link-to}}
         {{/if}}
       {{/if}}
     </h5>
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs
index 6f41d33e..a9387fe9 100644
--- a/assets/scripts/app/templates/workers/list.hbs
+++ b/assets/scripts/app/templates/workers/list.hbs
@@ -14,9 +14,9 @@
                 <div class="status"></div>
                 {{#if worker.isWorking}}
                   {{#if worker.jobId}}
-                    {{#linkTo "job" worker.repo worker.jobId}}
+                    {{#link-to "job" worker.repo worker.jobId}}
                       {{view.display}}
-                    {{/linkTo}}
+                    {{/link-to}}
                   {{/if}}
                 {{else}}
                   {{view.display}}