diff --git a/package.json b/package.json
index b1c4295..fc4b787 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "qunitjs": "^2.3.3"
   },
   "dependencies": {
-    "ember-rfc176-data": "^0.2.7"
+    "ember-rfc176-data": "^0.3.0"
   },
   "directories": {
     "test": "tests"
diff --git a/src/index.js b/src/index.js
index 6aa9b66..7370984 100644
--- a/src/index.js
+++ b/src/index.js
@@ -19,19 +19,16 @@ module.exports = function(babel) {
   // Flips the ember-rfc176-data mapping into an 'import' indexed object, that exposes the
   // default import as well as named imports, e.g. import {foo} from 'bar'
   const reverseMapping = {};
-  Object.keys(mapping).forEach(global => {
-    const imported = mapping[global];
-    const importRoot = imported[0];
-    let importName = imported[1];
-    if (!importName) {
-      importName = 'default';
-    }
+  mapping.forEach(exportDefinition => {
+    const imported = exportDefinition.global.substr('Ember.'.length);
+    const importRoot = exportDefinition.module;
+    let importName = exportDefinition.export;
 
     if (!reverseMapping[importRoot]) {
       reverseMapping[importRoot] = {};
     }
 
-    reverseMapping[importRoot][importName] = global;
+    reverseMapping[importRoot][importName] = imported;
   });
 
   return {
diff --git a/tests/index-test.js b/tests/index-test.js
index 48a0ead..b96c6db 100644
--- a/tests/index-test.js
+++ b/tests/index-test.js
@@ -27,11 +27,10 @@ function matches(source, expected) {
 }
 
 // Ensure each of the config mappings is mapped correctly
-Object.keys(mapping).forEach(global => {
-  const imported = mapping[global];
-  const importRoot = imported[0];
+mapping.forEach(exportDefinition => {
+  const importRoot = exportDefinition.module;
 
-  let importName = imported[1];
+  let importName = exportDefinition.export;
   if (!importName) {
     importName = 'default';
   }
@@ -41,7 +40,7 @@ Object.keys(mapping).forEach(global => {
   describe(`ember-modules-api-polyfill-${importRoot}-with-${importName}`, () => {
     matches(
       `import ${localName} from '${importRoot}';`,
-      `var ${varName} = Ember.${global};`
+      `var ${varName} = ${exportDefinition.global};`
     );
   });
 });
diff --git a/yarn.lock b/yarn.lock
index 2e683d7..d593ca2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -491,9 +491,9 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-ember-rfc176-data@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b"
+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"
 
 encoding@^0.1.11:
   version "0.1.12"