diff --git a/src/babel/traversal/scope.js b/src/babel/traversal/scope.js
index dba85887cc..087c4893aa 100644
--- a/src/babel/traversal/scope.js
+++ b/src/babel/traversal/scope.js
@@ -244,12 +244,14 @@ export default class Scope {
 
     var add = function (node) {
       if (t.isModuleDeclaration(node)) {
-        if (node.specifiers && node.specifiers.length) {
+        if (node.source) {
+          add(node.source);
+        } else if (node.specifiers && node.specifiers.length) {
           for (var i = 0; i < node.specifiers.length; i++) {
             add(node.specifiers[i]);
           }
-        } else {
-          add(node.source);
+        } else if (node.declaration) {
+          add(node.declaration);
         }
       } else if (t.isModuleSpecifier(node)) {
         add(node.local);
diff --git a/test/core/fixtures/transformation/es6.modules-common/hoist-function-exports/expected.js b/test/core/fixtures/transformation/es6.modules-common/hoist-function-exports/expected.js
index ac70c5a1d1..0b3a8db229 100644
--- a/test/core/fixtures/transformation/es6.modules-common/hoist-function-exports/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/hoist-function-exports/expected.js
@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.nextOdd = nextOdd;
 
-var _isEven = require("./evens");
+var _evens = require("./evens");
 
 function nextOdd(n) {
-  return _isEven.isEven(n) ? n + 1 : n + 2;
+  return _evens.isEven(n) ? n + 1 : n + 2;
 }
 
 var isOdd = (function (isEven) {
   return function (n) {
     return !isEven(n);
   };
-})(_isEven.isEven);
-exports.isOdd = isOdd;
+})(_evens.isEven);
+exports.isOdd = isOdd;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-common/imports-default/expected.js b/test/core/fixtures/transformation/es6.modules-common/imports-default/expected.js
index e746b176e9..f4df24882d 100644
--- a/test/core/fixtures/transformation/es6.modules-common/imports-default/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/imports-default/expected.js
@@ -4,7 +4,7 @@ var _foo = require("foo");
 
 var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-var _foo22 = babelHelpers.interopRequireDefault(_foo);
+var _foo3 = babelHelpers.interopRequireDefault(_foo);
 
 _foo2["default"];
-_foo22["default"];
\ No newline at end of file
+_foo3["default"];
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-common/imports-glob/expected.js b/test/core/fixtures/transformation/es6.modules-common/imports-glob/expected.js
index c836107105..46d2a82d35 100644
--- a/test/core/fixtures/transformation/es6.modules-common/imports-glob/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/imports-glob/expected.js
@@ -1,5 +1,5 @@
 "use strict";
 
-var _import = require("foo");
+var _foo = require("foo");
 
-var foo = babelHelpers.interopRequireWildcard(_import);
\ No newline at end of file
+var foo = babelHelpers.interopRequireWildcard(_foo);
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-common/imports-mixing/expected.js b/test/core/fixtures/transformation/es6.modules-common/imports-mixing/expected.js
index a12225a350..4c1ee7d06c 100644
--- a/test/core/fixtures/transformation/es6.modules-common/imports-mixing/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/imports-mixing/expected.js
@@ -1,8 +1,8 @@
 "use strict";
 
-var _foo$xyz = require("foo");
+var _foo = require("foo");
 
-var _foo$xyz2 = babelHelpers.interopRequireDefault(_foo$xyz);
+var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-_foo$xyz2["default"];
-_foo$xyz.baz;
\ No newline at end of file
+_foo2["default"];
+_foo.baz;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-common/imports-named/expected.js b/test/core/fixtures/transformation/es6.modules-common/imports-named/expected.js
index fe2b23d94c..ccce2e64ad 100644
--- a/test/core/fixtures/transformation/es6.modules-common/imports-named/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/imports-named/expected.js
@@ -1,10 +1,10 @@
 "use strict";
 
-var _bar = require("foo");
+var _foo = require("foo");
 
-_bar.bar;
-_bar.bar2;
-_bar.baz;
-_bar.bar;
-_bar.bar;
-_bar.xyz;
+_foo.bar;
+_foo.bar2;
+_foo.baz;
+_foo.bar;
+_foo.bar;
+_foo.xyz;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es6.modules-common/overview/expected.js b/test/core/fixtures/transformation/es6.modules-common/overview/expected.js
index 55be7569e4..8972640fb9 100644
--- a/test/core/fixtures/transformation/es6.modules-common/overview/expected.js
+++ b/test/core/fixtures/transformation/es6.modules-common/overview/expected.js
@@ -10,22 +10,22 @@ require("foo-bar");
 
 require("./directory/foo-bar");
 
-var _foo = require("foo2");
+var _foo2 = require("foo2");
 
-var _foo2 = babelHelpers.interopRequireDefault(_foo);
+var _foo22 = babelHelpers.interopRequireDefault(_foo2);
 
-var _import = require("foo3");
+var _foo3 = require("foo3");
 
-var foo2 = babelHelpers.interopRequireWildcard(_import);
+var foo2 = babelHelpers.interopRequireWildcard(_foo3);
 
-var _bar = require("foo4");
+var _foo4 = require("foo4");
 
-var _bar2 = require("foo5");
+var _foo5 = require("foo5");
 
 exports.test = test;
 var test = 5;
 
 exports.test = test;
-_bar.bar;
-_bar2.foo;
-_foo2["default"];
\ No newline at end of file
+_foo4.bar;
+_foo5.foo;
+_foo22["default"];
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.export-extensions/default-commonjs/expected.js b/test/core/fixtures/transformation/es7.export-extensions/default-commonjs/expected.js
index 40f2fd7f7d..071100b51e 100644
--- a/test/core/fixtures/transformation/es7.export-extensions/default-commonjs/expected.js
+++ b/test/core/fixtures/transformation/es7.export-extensions/default-commonjs/expected.js
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _foo2 = require("bar");
+var _bar = require("bar");
 
-var _foo3 = babelHelpers.interopRequireDefault(_foo2);
+var _bar2 = babelHelpers.interopRequireDefault(_bar);
 
-exports.foo = _foo3["default"];
+exports.foo = _bar2["default"];
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/es7.export-extensions/namespace-commonjs/expected.js b/test/core/fixtures/transformation/es7.export-extensions/namespace-commonjs/expected.js
index 211a06621c..f1418a9c88 100644
--- a/test/core/fixtures/transformation/es7.export-extensions/namespace-commonjs/expected.js
+++ b/test/core/fixtures/transformation/es7.export-extensions/namespace-commonjs/expected.js
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _import = require("bar");
+var _bar = require("bar");
 
-var _foo = babelHelpers.interopRequireWildcard(_import);
+var _foo = babelHelpers.interopRequireWildcard(_bar);
 
-exports.foo = _foo;
+exports.foo = _foo;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/misc/regression-lodash-tostring-import/expected.js b/test/core/fixtures/transformation/misc/regression-lodash-tostring-import/expected.js
index b7470e7ab4..aaa4600679 100644
--- a/test/core/fixtures/transformation/misc/regression-lodash-tostring-import/expected.js
+++ b/test/core/fixtures/transformation/misc/regression-lodash-tostring-import/expected.js
@@ -1,7 +1,7 @@
 "use strict";
 
-var _toString = require("foo");
+var _foo = require("foo");
 
-var _toString2 = babelHelpers.interopRequireDefault(_toString);
+var _foo2 = babelHelpers.interopRequireDefault(_foo);
 
-_toString2["default"];
+_foo2["default"];
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/runtime/full/expected.js b/test/core/fixtures/transformation/runtime/full/expected.js
index 6ea5a0c164..2f08b10a1c 100644
--- a/test/core/fixtures/transformation/runtime/full/expected.js
+++ b/test/core/fixtures/transformation/runtime/full/expected.js
@@ -17,11 +17,11 @@ _Object$defineProperty(exports, "__esModule", {
 exports.giveWord = giveWord;
 var marked0$0 = [giveWord].map(_regeneratorRuntime.mark);
 
-var _foo = require("someModule");
+var _someModule = require("someModule");
 
-var _foo2 = _interopRequireDefault(_foo);
+var _someModule2 = _interopRequireDefault(_someModule);
 
-var bar = _interopRequireWildcard(_foo);
+var bar = _interopRequireWildcard(_someModule);
 
 var myWord = _Symbol("abc");
 exports.myWord = myWord;
@@ -40,5 +40,5 @@ function giveWord() {
   }, marked0$0[0], this);
 }
 
-_foo2["default"];
-bar;
+_someModule2["default"];
+bar;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/spec.function-name/modules-2/expected.js b/test/core/fixtures/transformation/spec.function-name/modules-2/expected.js
index 8d94890652..37862d163a 100644
--- a/test/core/fixtures/transformation/spec.function-name/modules-2/expected.js
+++ b/test/core/fixtures/transformation/spec.function-name/modules-2/expected.js
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _last2 = require("lodash/array/last");
+var _lodashArrayLast = require("lodash/array/last");
 
-var _last3 = babelHelpers.interopRequireDefault(_last2);
+var _lodashArrayLast2 = babelHelpers.interopRequireDefault(_lodashArrayLast);
 
 var Container = (function () {
   function Container() {
@@ -20,11 +20,11 @@ var Container = (function () {
         return;
       }
 
-      return _last3["default"](this.tokens.get(key));
+      return _lodashArrayLast2["default"](this.tokens.get(key));
     }
   }]);
   return Container;
 })();
 
 exports["default"] = Container;
-module.exports = exports["default"];
+module.exports = exports["default"];
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/spec.function-name/modules-3/expected.js b/test/core/fixtures/transformation/spec.function-name/modules-3/expected.js
index 5e08d99462..31cbac0a7c 100644
--- a/test/core/fixtures/transformation/spec.function-name/modules-3/expected.js
+++ b/test/core/fixtures/transformation/spec.function-name/modules-3/expected.js
@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _getForm2 = require("./store");
+var _store = require("./store");
 
 var Login = (function (_React$Component) {
   function Login() {
@@ -19,11 +19,11 @@ var Login = (function (_React$Component) {
   babelHelpers.createClass(Login, [{
     key: "getForm",
     value: function getForm() {
-      return _getForm2.getForm().toJS();
+      return _store.getForm().toJS();
     }
   }]);
   return Login;
 })(React.Component);
 
 exports["default"] = Login;
-module.exports = exports["default"];
+module.exports = exports["default"];
\ No newline at end of file