diff --git a/app/templates/annotations/list.hbs b/app/templates/annotations/list.hbs
index 663f6303..45cd5487 100644
--- a/app/templates/annotations/list.hbs
+++ b/app/templates/annotations/list.hbs
@@ -1,6 +1,6 @@
 {{#if view.annotations}}
 <div id="annotations">
-  {{#each annotation in view.annotations}}
+  {{#each view.annotations as |annotation|}}
     <div class="annotation">
       <a href={{annotation.url}}>
           {{annotation.status}} {{annotation.providerName}}
diff --git a/app/templates/components/add-env-var.hbs b/app/templates/components/add-env-var.hbs
index d891308f..428b3af0 100644
--- a/app/templates/components/add-env-var.hbs
+++ b/app/templates/components/add-env-var.hbs
@@ -1,6 +1,6 @@
 <form {{action "save" on="submit"}}>
   <div class="form-elem">
-    {{input value=name class="env-name" on="key-up" action="nameChanged" placeholder="Name"}}
+    {{input value=name class="env-name" key-up="nameChanged" placeholder="Name"}}
     {{#if nameIsBlank }}
       <p class="form-error-message">Name cannot be blank</p>
     {{/if}}
diff --git a/app/templates/components/limit-concurrent-builds.hbs b/app/templates/components/limit-concurrent-builds.hbs
index ed67422c..7c1016fc 100644
--- a/app/templates/components/limit-concurrent-builds.hbs
+++ b/app/templates/components/limit-concurrent-builds.hbs
@@ -6,7 +6,7 @@
   </a>
 </div>
 {{#if enabled}}
-  {{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
+  {{input pattern="/^[0-9]+$/" value=value key-up="limitChanged"}}
 {{/if}}
 {{#if isSaving}}
 {{loading-indicator inline=true}}
diff --git a/app/templates/dashboard/repositories.hbs b/app/templates/dashboard/repositories.hbs
index 5285f34f..5493d13e 100644
--- a/app/templates/dashboard/repositories.hbs
+++ b/app/templates/dashboard/repositories.hbs
@@ -17,7 +17,7 @@
   </section> --}}
 
   <ul class="dashboard-active">
-    {{#each repo in filteredRepositories}}
+    {{#each filteredRepositories as |repo|}}
       {{dashboard-row repo=repo}}
     {{else}}
       {{no-repos}}
diff --git a/app/templates/events/list.hbs b/app/templates/events/list.hbs
index 56fc64bd..c0e895e4 100644
--- a/app/templates/events/list.hbs
+++ b/app/templates/events/list.hbs
@@ -10,8 +10,8 @@
     </thead>
 
     <tbody>
-      {{#each event in view.events}}
-        {{#view "events-item" contextBinding="event"}}
+      {{#each view.events as |event|}}
+        {{#view "events-item" context="event"}}
           <td class="created_at">
             {{format-time createdAt}}
           </td>
diff --git a/app/templates/helpers/travis-errors.hbs b/app/templates/helpers/travis-errors.hbs
index 1f8c68c6..394cd011 100644
--- a/app/templates/helpers/travis-errors.hbs
+++ b/app/templates/helpers/travis-errors.hbs
@@ -1 +1 @@
-{{#each error in view.errors}}{{error.message}}{{/each}}
+{{#each view.errors as |error|}}{{error.message}}{{/each}}
diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index b4c4124e..36e66626 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -26,7 +26,7 @@
   </section>
   <section class="profile-orgs">
     <h1>Organizations</h1>
-    {{#collection "accounts-list" contentBinding="organizations"}}
+    {{#collection "accounts-list" content="organizations"}}
       {{#link-to "account" view.account class="name"}}
         <div class="media">
           <div class="media-elem">
diff --git a/app/templates/status-images.hbs b/app/templates/status-images.hbs
index 7efbe96d..2e49845c 100644
--- a/app/templates/status-images.hbs
+++ b/app/templates/status-images.hbs
@@ -2,13 +2,13 @@
 <p>
   <label>Branch:</label>
   {{#if view.branches.isLoaded}}
-    {{view Ember.Select contentBinding="view.branches" selectionBinding="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
+    {{view Ember.Select content="view.branches" selection="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
   {{else}}
     {{loading-indicator}}
   {{/if}}
 </p>
 
 <p>
-  <label>{{view Ember.Select contentBinding="view.formats" selectionBinding="view.statusImageFormat"}}</label>
-  {{view 'status-image-input' valueBinding="view.statusString" class="url" rows=3}}
+  <label>{{view Ember.Select content="view.formats" selection="view.statusImageFormat"}}</label>
+  {{view 'status-image-input' value="view.statusString" class="url" rows=3}}
 </p>