diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs
index eadc1042..ec8bb779 100644
--- a/assets/scripts/app/templates/builds/show.hbs
+++ b/assets/scripts/app/templates/builds/show.hbs
@@ -58,9 +58,9 @@
   {{/unless}}
 
   {{#if build.isMatrix}}
-    {{view Travis.JobsView jobsBinding="build.requiredJobs" required="true"}}
-    {{view Travis.JobsView jobsBinding="build.allowedFailureJobs"}}
+    {{view 'jobs' jobs=build.requiredJobs required="true"}}
+    {{view 'jobs' jobs=build.allowedFailureJobs}}
   {{else}}
-    {{view Travis.LogView jobBinding="build.jobs.firstObject"}}
+    {{view 'log' job=build.jobs.firstObject}}
   {{/if}}
 {{/if}}
diff --git a/assets/scripts/app/templates/jobs/list.hbs b/assets/scripts/app/templates/jobs/list.hbs
index 046d2981..93f2685f 100644
--- a/assets/scripts/app/templates/jobs/list.hbs
+++ b/assets/scripts/app/templates/jobs/list.hbs
@@ -20,7 +20,7 @@
     </thead>
     <tbody>
       {{#each job in view.jobs}}
-        {{#view Travis.JobsItemView contextBinding="job"}}
+        {{#view 'jobs-item' context=job}}
           <td class="number">
             <span class="status"></span>
             {{#if job.id}}
diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index 17ea50f4..961db9b6 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -1,12 +1,12 @@
 <div id="search_box">
-  {{view Ember.TextField valueBinding="controller.search" placeholder="Search all repositories"}}
+  {{input value=controller.search placeholder="Search all repositories"}}
 </div>
 
-{{view Travis.ReposListTabsView}}
+{{view 'repos-list-tabs'}}
 
 <div class="tab">
   {{#if isLoaded}}
-    {{#collection Travis.ReposListView contentBinding="this"}}
+    {{#collection 'repos-list' content=this}}
       {{#with view.repo}}
         <div class="slug-and-status">
           <span class="status"></span>
diff --git a/assets/scripts/app/templates/repos/show.hbs b/assets/scripts/app/templates/repos/show.hbs
index 01dbc972..25905896 100644
--- a/assets/scripts/app/templates/repos/show.hbs
+++ b/assets/scripts/app/templates/repos/show.hbs
@@ -7,13 +7,13 @@
         <div id="repo-header">
           <h3>{{#link-to "repo" this}}{{slug}}{{/link-to}}</h3>
           <div class="github-icon"><a {{bind-attr href="controller.urlGithub"}}><img src="/images/icons/github.svg" width="21" height="21"/></a></div>
-          {{view Travis.RepoShowToolsView}}
+          {{view 'repo-show-tools'}}
         </div>
 
         <p class="description">{{description}}</p>
 
-        {{view Travis.RepoShowTabsView}}
-        {{view Travis.RepoActionsView}}
+        {{view 'repo-show-tabs'}}
+        {{view 'repo-actions'}}
       {{/with}}
 
       <div class="tab">
diff --git a/assets/scripts/app/templates/repos/show/tabs.hbs b/assets/scripts/app/templates/repos/show/tabs.hbs
index 793bd65c..670aedda 100644
--- a/assets/scripts/app/templates/repos/show/tabs.hbs
+++ b/assets/scripts/app/templates/repos/show/tabs.hbs
@@ -2,7 +2,7 @@
   <li id="tab_current" {{bind-attr class="view.classCurrent"}}>
     <h5>
       {{#if repo.slug}}
-        {{#link-to "repo" repo currentWhen="repo.index"}}
+        {{#link-to "repo" repo current-when="repo.index"}}
           Current
         {{/link-to}}
       {{/if}}