diff --git a/package.json b/package.json
index a910727..a0a162a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "ember-rfc176-data": "^0.2.6",
+    "ember-rfc176-data": "^0.3.0",
     "execa": "~0.8.0",
     "glob": "^7.1.1",
     "jscodeshift": "^0.3.29"
diff --git a/transform.js b/transform.js
index 853ad9e..83bd46b 100644
--- a/transform.js
+++ b/transform.js
@@ -123,8 +123,10 @@ function transform(file, api, options) {
   function buildMappings(registry) {
     let mappings = {};
 
-    for (let mapping of Object.keys(MAPPINGS)) {
-      mappings[mapping] = new Mapping(MAPPINGS[mapping], registry);
+    for (let mapping of MAPPINGS) {
+      if (!mapping.deprecated) {
+        mappings[mapping.global.substr('Ember.'.length)] = new Mapping(mapping, registry);
+      }
     }
 
     return mappings;
@@ -302,14 +304,16 @@ function transform(file, api, options) {
       let mapping = mappings[propertyPath];
 
       let mod = mapping.getModule();
-      if (!mod.local) {
+      let local = mod.local;
+      if (!local) {
         // Ember.computed.or => or
-        let local = propertyPath.split(".").slice(-1)[0];
-        if (includes(RESERVED, local)) {
-          local = `Ember${local}`;
-        }
-        mod.local = local;
+        local = propertyPath.split(".").slice(-1)[0];
+      }
+
+      if (includes(RESERVED, local)) {
+        local = `Ember${local}`;
       }
+      mod.local = local;
 
       return new Replacement(nodePath, mod);
     };
@@ -682,10 +686,10 @@ class Replacement {
 }
 
 class Mapping {
-  constructor([source, imported, local], registry) {
-    this.source = source;
-    this.imported = imported || "default";
-    this.local = local;
+  constructor({module, export: exportName, localName}, registry) {
+    this.source = module;
+    this.imported = exportName;
+    this.local = localName;
     this.registry = registry;
   }
 
diff --git a/yarn.lock b/yarn.lock
index a033ac0..ccc3cf7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1225,9 +1225,9 @@ electron-to-chromium@^1.3.16:
   version "1.3.16"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz#d0e026735754770901ae301a21664cba45d92f7d"
 
-ember-rfc176-data@^0.2.6:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.6.tgz#ff9981d117a885a7344813685a9f3bf8257d1016"
+ember-rfc176-data@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.0.tgz#6aee728cb521c5f80710990965027b9c320f6f08"
 
 errno@^0.1.4:
   version "0.1.4"