diff --git a/app/controllers/container-type.js b/app/controllers/container-type.js
index 57fdcd23d0..f6e7a3a4fb 100644
--- a/app/controllers/container-type.js
+++ b/app/controllers/container-type.js
@@ -1,4 +1,4 @@
-import { get, computed } from '@ember/object';
+import { action, get, computed } from '@ember/object';
 import Controller, { inject as controller } from '@ember/controller';
 import debounceComputed from 'ember-inspector/computed/debounce';
 import searchMatch from 'ember-inspector/utils/search-match';
@@ -34,22 +34,23 @@ export default Controller.extend({
     this.sortProperties = ['name'];
   },
 
-  actions: {
-    /**
-     * Inspect an instance in the object inspector.
-     * Called whenever an item in the list is clicked.
-     *
-     * @method inspectInstance
-     * @param {Object} obj
-     */
-    inspectInstance(obj) {
-      if (!get(obj, 'inspectable')) {
-        return;
-      }
-      this.port.send('objectInspector:inspectByContainerLookup', { name: get(obj, 'fullName') });
-    },
-    sendContainerToConsole() {
-      this.port.send('objectInspector:sendContainerToConsole');
+  /**
+   * Inspect an instance in the object inspector.
+   * Called whenever an item in the list is clicked.
+   *
+   * @method inspectInstance
+   * @param {Object} obj
+   */
+  inspectInstance: action(function(obj) {
+    if (!get(obj, 'inspectable')) {
+      return;
     }
-  }
+    this.port.send('objectInspector:inspectByContainerLookup', {
+      name: get(obj, 'fullName')
+    });
+  }),
+
+  sendContainerToConsole: action(function() {
+    this.port.send('objectInspector:sendContainerToConsole');
+  }),
 });
diff --git a/app/controllers/container-types/index.js b/app/controllers/container-types/index.js
index e9f948389b..7079cf9e22 100644
--- a/app/controllers/container-types/index.js
+++ b/app/controllers/container-types/index.js
@@ -1,9 +1,8 @@
+import { action } from '@ember/object';
 import Controller from '@ember/controller';
 
 export default Controller.extend({
-  actions: {
-    sendContainerToConsole() {
-      this.port.send('objectInspector:sendContainerToConsole');
-    }
-  }
+  sendContainerToConsole: action(function() {
+    this.port.send('objectInspector:sendContainerToConsole');
+  })
 });
diff --git a/app/templates/components/item-types.hbs b/app/templates/components/item-types.hbs
index 787839d4dd..a46a8d4b09 100644
--- a/app/templates/components/item-types.hbs
+++ b/app/templates/components/item-types.hbs
@@ -1,25 +1,25 @@
 <div class="split">
   {{#draggable-column
     classes="split__panel split__panel--sidebar-2 nav"
-    setIsDragging=setIsDragging
-    width=width
+    setIsDragging=@setIsDragging
+    width=@width
   }}
     <div class="split__panel__bd">
-      <h1 class="nav__title">{{header}}</h1>
+      <h1 class="nav__title">{{@header}}</h1>
 
       <ul>
-        {{#each sorted as |itemType|}}
-          <li class={{typeClass}}>
+        {{#each @sorted as |itemType|}}
+          <li class={{this.typeClass}}>
             {{#link-to
-              (if (eq type "model") "records" "container-type")
+              (if (eq @type "model") "records" "container-type")
               (escape-url itemType.name)
               class="nav__item"
             }}
-              <span class={{concat typeClass "-name" " nav__item-label"}}>
+              <span class={{concat this.typeClass "-name" " nav__item-label"}}>
                 {{itemType.name}}
               </span>
 
-              <span class={{concat typeClass "-count" " pill"}}>{{itemType.count}}</span>
+              <span class={{concat this.typeClass "-count" " pill"}}>{{itemType.count}}</span>
             {{/link-to}}
           </li>
         {{/each}}
diff --git a/app/templates/container-type-toolbar.hbs b/app/templates/container-type-toolbar.hbs
index 2c5d40c98e..d831d5299c 100644
--- a/app/templates/container-type-toolbar.hbs
+++ b/app/templates/container-type-toolbar.hbs
@@ -6,7 +6,7 @@
 
   <Ui::ToolbarDivider />
 
-  <Ui::SendToConsole @action={{action "sendContainerToConsole"}} />
+  <Ui::SendToConsole @action={{this.sendContainerToConsole}} />
 
   <Ui::ToolbarDivider />
 
diff --git a/app/templates/container-type.hbs b/app/templates/container-type.hbs
index 9fc45ca4a8..a244b74156 100644
--- a/app/templates/container-type.hbs
+++ b/app/templates/container-type.hbs
@@ -10,7 +10,10 @@
     }}
       {{#r.cell as |value|}}
         {{#if value.inspectable}}
-          <div class="is-link js-instance-name" {{action "inspectInstance" value}}>
+          <div
+            class="is-link js-instance-name"
+            {{on "click" (fn this.inspectInstance value)}}
+          >
             {{value.name}}
           </div>
         {{else}}
diff --git a/app/templates/container-types.hbs b/app/templates/container-types.hbs
index 2d6fb65379..398fbda8c8 100644
--- a/app/templates/container-types.hbs
+++ b/app/templates/container-types.hbs
@@ -1,9 +1,9 @@
-{{#item-types
-  header="Types"
-  setIsDragging=(action "setIsDragging" target=application)
-  sorted=(readonly sorted)
-  type="container"
-  width=180
-}}
+<ItemTypes
+  @header="Types"
+  @setIsDragging={{action "setIsDragging" target=application}}
+  @sorted={{readonly sorted}}
+  @type="container"
+  @width={{180}}
+>
   {{outlet}}
-{{/item-types}}
+</ItemTypes>
diff --git a/app/templates/container-types/index-toolbar.hbs b/app/templates/container-types/index-toolbar.hbs
index 0db09466e6..af734683f9 100644
--- a/app/templates/container-types/index-toolbar.hbs
+++ b/app/templates/container-types/index-toolbar.hbs
@@ -6,5 +6,5 @@
 
   <Ui::ToolbarDivider />
 
-  <Ui::SendToConsole @action={{action "sendContainerToConsole"}} />
+  <Ui::SendToConsole @action={{this.sendContainerToConsole}} />
 </div>
diff --git a/app/templates/model-types.hbs b/app/templates/model-types.hbs
index 0644f7ccb1..f31dd7d422 100644
--- a/app/templates/model-types.hbs
+++ b/app/templates/model-types.hbs
@@ -1,9 +1,9 @@
-{{#item-types
-  header="Model Types"
-  setIsDragging=(action "setIsDragging" target=application)
-  sorted=(readonly (if orderByRecordCount sortByDescCount sortByName))
-  type="model"
-  width=navWidth
-}}
+<ItemTypes
+  @header="Model Types"
+  @setIsDragging={{action "setIsDragging" target=application}}
+  @sorted={{readonly (if this.orderByRecordCount this.sortByDescCount this.sortByName)}}
+  @type="model"
+  @width={{navWidth}}
+>
   {{outlet}}
-{{/item-types}}
+</ItemTypes>