diff --git a/app/controllers/container-types.js b/app/controllers/container-types.js
index ff3b176c8a..72c3e591d6 100644
--- a/app/controllers/container-types.js
+++ b/app/controllers/container-types.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
-var ArrayController = Ember.ArrayController;
+const { Controller, computed: { sort } } = Ember;
 
-export default ArrayController.extend({
-  sortProperties: ['name']
+export default Controller.extend({
+  sortProperties: ['name'],
+  sorted: sort('model', 'sortProperties')
 });
diff --git a/app/controllers/info.js b/app/controllers/info.js
new file mode 100644
index 0000000000..7d100ffc2d
--- /dev/null
+++ b/app/controllers/info.js
@@ -0,0 +1,4 @@
+import Ember from 'ember';
+const { Controller} = Ember;
+
+export default Controller;
diff --git a/app/controllers/model-types.js b/app/controllers/model-types.js
index 55c81cd537..43a3ba4dbd 100644
--- a/app/controllers/model-types.js
+++ b/app/controllers/model-types.js
@@ -1,5 +1,9 @@
 import Ember from "ember";
-export default Ember.ArrayController.extend({
+const { Controller, computed: { sort } } = Ember;
+
+export default Controller.extend({
   navWidth: 180,
-  sortProperties: ['name']
+  sortProperties: ['name'],
+
+  sorted: sort('model', 'sortProperties')
 });
diff --git a/app/controllers/records.js b/app/controllers/records.js
index dcb6cf2952..02712b6dbb 100644
--- a/app/controllers/records.js
+++ b/app/controllers/records.js
@@ -1,9 +1,9 @@
 import Ember from "ember";
 import escapeRegExp from "ember-inspector/utils/escape-reg-exp";
-const { computed } = Ember;
+const { Controller, computed } = Ember;
 const { none, alias } = computed;
 
-export default Ember.ArrayController.extend({
+export default Controller.extend({
   needs: ['application'],
 
   queryParams: ['filterValue', 'search'],
diff --git a/app/controllers/render-tree.js b/app/controllers/render-tree.js
index a0cd75ba3a..84a0edee6a 100644
--- a/app/controllers/render-tree.js
+++ b/app/controllers/render-tree.js
@@ -1,13 +1,11 @@
 import Ember from "ember";
 import escapeRegExp from "ember-inspector/utils/escape-reg-exp";
 import debounceComputed from "ember-inspector/computed/debounce";
-var get = Ember.get;
-var isEmpty = Ember.isEmpty;
-var and = Ember.computed.and;
-var equal = Ember.computed.equal;
-var filter = Ember.computed.filter;
 
-export default Ember.ArrayController.extend({
+const { get, isEmpty, computed, Controller } = Ember;
+const { and, equal, filter } = computed;
+
+export default Controller.extend({
   needs: ['application'],
 
   initialEmpty: false,
@@ -25,7 +23,7 @@ export default Ember.ArrayController.extend({
     return escapeRegExp(this.get('search').toLowerCase());
   }.property('search'),
 
-  arrangedContent: filter('model', function(item) {
+  filtered: filter('model', function(item) {
     var search = this.get('escapedSearch');
     if (isEmpty(search)) {
       return true;
diff --git a/app/templates/container-types.hbs b/app/templates/container-types.hbs
index 9525b0b4cd..96e7232354 100644
--- a/app/templates/container-types.hbs
+++ b/app/templates/container-types.hbs
@@ -1,4 +1,5 @@
 <div class="split">
+
   {{#draggable-column
           width=180
           classNames="split__panel split__panel--sidebar-2 nav"}}
@@ -9,11 +10,11 @@
       </div>
 
       <ul>
-        {{#each}}
+        {{#each sorted as |containerType|}}
           <li data-label="container-type">
-            {{#link-to "container-type" name}}
-              <span data-label="container-type-name">{{name}}</span>
-              (<span data-label="container-type-count">{{count}}</span>)
+            {{#link-to "container-type" containerType.name}}
+              <span data-label="container-type-name">{{containerType.name}}</span>
+              (<span data-label="container-type-count">{{containerType.count}}</span>)
             {{/link-to}}
           </li>
         {{/each}}
diff --git a/app/templates/info.hbs b/app/templates/info.hbs
index 14623be504..c574cfc9fb 100644
--- a/app/templates/info.hbs
+++ b/app/templates/info.hbs
@@ -12,14 +12,14 @@
   <div class="list-view__list-container">
     <div class="list-tree">
       <div class="ember-list-container">
-        {{#each}}
+        {{#each model as |library|}}
           <div data-label="library-row" class="list-tree__item-wrapper row-wrapper">
             <div class="list-tree__item row">
               <div class="cell_type_main cell cell_size_large">
-                <span data-label="lib-name">{{unbound name}}</span>
+                <span data-label="lib-name">{{unbound library.name}}</span>
               </div>
               <div class="cell">
-                <span data-label="lib-version">{{unbound version}}</span>
+                <span data-label="lib-version">{{unbound library.version}}</span>
               </div>
             </div>
           </div>
diff --git a/app/templates/mixin-details.hbs b/app/templates/mixin-details.hbs
index d6599f18d8..10945f8072 100644
--- a/app/templates/mixin-details.hbs
+++ b/app/templates/mixin-details.hbs
@@ -7,27 +7,27 @@
   {{/if}}
   {{#if mixin.isExpanded}}
   <ul class="mixin__properties">
-    {{#each mixin.properties itemController="mixinProperty"}}
-    <li {{bind-attr class="overridden:mixin__property_state_overridden :mixin__property"}} data-label="object-property">
-      {{#if value.computed}}
-        <button {{bind-attr class=":mixin__calc-btn isCalculated:mixin__calc-btn_calculated"}} {{action "calculate" model bubbles=false}} data-label="calculate"><img src="assets/images/calculate.svg"></button>
+    {{#each mixin.properties itemController="mixinProperty" as |property|}}
+    <li {{bind-attr class="property.overridden:mixin__property_state_overridden :mixin__property"}} data-label="object-property">
+      {{#if property.value.computed}}
+        <button {{bind-attr class=":mixin__calc-btn property.isCalculated:mixin__calc-btn_calculated"}} {{action "calculate" property.model bubbles=false}} data-label="calculate"><img src="assets/images/calculate.svg"></button>
       {{else}}
         <span class='pad'></span>
       {{/if}}
-      <span class='mixin__property-name' data-label="object-property-name">{{name}}</span><span class='mixin__property-value-separator'>: </span>
-      {{#unless isEdit}}
-        <span  {{action "valueClick" model}} {{bind-attr class="value.type :mixin__property-value"}} data-label="object-property-value">{{value.inspect}}</span>
+      <span class='mixin__property-name' data-label="object-property-name">{{property.name}}</span><span class='mixin__property-value-separator'>: </span>
+      {{#unless property.isEdit}}
+        <span  {{action "valueClick" property.model}} {{bind-attr class="property.value.type :mixin__property-value"}} data-label="object-property-value">{{property.value.inspect}}</span>
       {{else}}
-        {{#unless isDate}}
-          {{property-field value=txtValue finished-editing="finishedEditing" save-property="saveProperty"
+        {{#unless property.isDate}}
+          {{property-field value=property.txtValue finished-editing="finishedEditing" save-property="saveProperty"
            class="mixin__property-value-txt" label="object-property-value-txt"}}
         {{else}}
-          {{date-property-field value=dateValue format="YYYY-MM-DD" finished-editing="finishedEditing" save-property="saveProperty"
+          {{date-property-field value=property.dateValue format="YYYY-MM-DD" finished-editing="finishedEditing" save-property="saveProperty"
            class="mixin__property-value-txt" label="object-property-value-date"}}
         {{/unless}}
       {{/unless}}
-      <span class='mixin__property-overridden-by'>(Overridden by {{overridden}})</span>
-      <button class="mixin__send-btn" {{action "sendToConsole" model}} data-label="send-to-console-btn"><img src="assets/images/send.png" title="Send to console"></button>
+      <span class='mixin__property-overridden-by'>(Overridden by {{property.overridden}})</span>
+      <button class="mixin__send-btn" {{action "sendToConsole" property.model}} data-label="send-to-console-btn"><img src="assets/images/send.png" title="Send to console"></button>
     </li>
     {{else}}
       <li class="mixin__property">No Properties</li>
diff --git a/app/templates/model-types.hbs b/app/templates/model-types.hbs
index 96b7dba853..75bf3033d4 100644
--- a/app/templates/model-types.hbs
+++ b/app/templates/model-types.hbs
@@ -5,11 +5,11 @@
     <div class="split__panel__bd">
       <div class="nav__title"><h3>Model Types</h3></div>
       <ul>
-        {{#each}}
+        {{#each sorted as |modelType|}}
           <li data-label="model-type">
-            {{#link-to "records" name}}
-              <span data-label="model-type-name">{{name}}</span>
-              (<span data-label="model-type-count">{{count}}</span>)
+            {{#link-to "records" modelType.name}}
+              <span data-label="model-type-name">{{modelType.name}}</span>
+              (<span data-label="model-type-count">{{modelType.count}}</span>)
             {{/link-to}}
           </li>
         {{/each}}
diff --git a/app/templates/records-toolbar.hbs b/app/templates/records-toolbar.hbs
index 84cd27df0d..55c13bdfde 100644
--- a/app/templates/records-toolbar.hbs
+++ b/app/templates/records-toolbar.hbs
@@ -9,7 +9,9 @@
 
   <div class="divider"></div>
 
-  {{#each filters itemController="recordFilter"}}
-    <button data-label="filter" {{bind-attr class="checked:active :toolbar__radio"}} {{action "setFilter" name}} >{{desc}}</button>
+  {{#each filters itemController="recordFilter" as |filter|}}
+    <button data-label="filter" {{bind-attr class="filter.checked:active :toolbar__radio"}} {{action "setFilter" filter.name}} >
+      {{filter.desc}}
+    </button>
   {{/each}}
-</div>
\ No newline at end of file
+</div>
diff --git a/app/templates/records.hbs b/app/templates/records.hbs
index 272713f36e..0b6bee9e70 100644
--- a/app/templates/records.hbs
+++ b/app/templates/records.hbs
@@ -1,7 +1,7 @@
 <div class="list-view">
   <div class="list-view__header row">
-    {{#each columns}}
-      <div class="cell cell_type_header" data-label="column-title">{{desc}}</div>
+    {{#each columns as |column|}}
+      <div class="cell cell_type_header" data-label="column-title">{{column.desc}}</div>
     {{/each}}
 
     <!-- Account for scrollbar width :'(  -->
diff --git a/app/templates/render-item.hbs b/app/templates/render-item.hbs
index f1d3cda6f5..09fc590c5c 100644
--- a/app/templates/render-item.hbs
+++ b/app/templates/render-item.hbs
@@ -14,7 +14,7 @@
   </div>
 </div>
 {{#if isExpanded}}
-  {{#each children}}
-    {{render "render_item" this}}
+  {{#each children as |child|}}
+    {{render "render_item" child}}
   {{/each}}
 {{/if}}
diff --git a/app/templates/render-tree.hbs b/app/templates/render-tree.hbs
index 5e84f53af4..71497a3a38 100644
--- a/app/templates/render-tree.hbs
+++ b/app/templates/render-tree.hbs
@@ -13,8 +13,8 @@
 
   <div class="ember-list-container">
     {{#view "render-list"}}
-      {{#each}}
-        {{render "render-item" this}}
+      {{#each filtered as |item|}}
+        {{render "render-item" item}}
       {{/each}}
     {{/view}}
   </div>
diff --git a/tests/ember_debug/object_inspector_test.js b/tests/ember_debug/object_inspector_test.js
index 14a129a156..845ab62028 100644
--- a/tests/ember_debug/object_inspector_test.js
+++ b/tests/ember_debug/object_inspector_test.js
@@ -18,7 +18,9 @@ function setupApp(){
     this.route('simple');
   });
 
-  Ember.TEMPLATES.simple = compile('Simple {{input class="simple-input"}} {{view Ember.View classNames="simple-view"}}');
+  App.SimpleView = Ember.View;
+
+  Ember.TEMPLATES.simple = compile('Simple {{input class="simple-input"}} {{view "simple" classNames="simple-view"}}');
 }
 
 module("Ember Debug - Object Inspector", {
diff --git a/tests/ember_debug/view_debug_test.js b/tests/ember_debug/view_debug_test.js
index 8b1b18556b..6e42c84d36 100644
--- a/tests/ember_debug/view_debug_test.js
+++ b/tests/ember_debug/view_debug_test.js
@@ -134,8 +134,8 @@ test("Simple View Tree", function(assert) {
 });
 
 
-test("Views created by {{each}} helper are shown", function(assert) {
-  var name = null, message = null;
+test("Views created by context switching {{each}} helper are shown", function(assert) {
+  let name = null, message = null;
   port.reopen({
     send: function(n, m) {
       name = n;
@@ -143,9 +143,13 @@ test("Views created by {{each}} helper are shown", function(assert) {
     }
   });
 
+  // Disable deprecation warning of context switching each helper
+  const originalDeprecate = Ember.deprecate;
+  Ember.deprecate = Ember.K;
   visit('/comments');
 
   andThen(function() {
+    Ember.deprecate = originalDeprecate;
     var tree = message.tree;
     var comments = tree.children[0].children;
     assert.equal(comments.length, 3, "There should be 3 views");