diff --git a/lib/6to5/transformation/modules/_default.js b/lib/6to5/transformation/modules/_default.js
index 391ceda34f..0580550fa2 100644
--- a/lib/6to5/transformation/modules/_default.js
+++ b/lib/6to5/transformation/modules/_default.js
@@ -50,7 +50,8 @@ DefaultFormatter.prototype.checkImportAssignments = function () {
   var file = this.file;
 
   var isLocalReference = function (node, scope) {
-    return t.isIdentifier(node) && localImports[node.name];
+    var localImport = localImports[node.name];
+    return t.isIdentifier(node) && localImport && localImport !== node;
   };
 
   var check = function (node) {
@@ -69,7 +70,7 @@ DefaultFormatter.prototype.checkImportAssignments = function () {
         }
 
         check(left);
-      } else if (t.isDeclaration(node) && !t.isImportDeclaration(node)) {
+      } if (t.isDeclaration(node)) {
         _.each(t.getIds(node, true), check);
       }
     }
diff --git a/lib/6to5/types/index.js b/lib/6to5/types/index.js
index 4ba4b9fc6b..9dc4584376 100644
--- a/lib/6to5/types/index.js
+++ b/lib/6to5/types/index.js
@@ -384,6 +384,7 @@ t.getIds = function (node, map, ignoreTypes) {
 
 t.getIds.nodes = {
   AssignmentExpression: ["left"],
+  ImportBatchSpecifier: ["name"],
   ImportSpecifier: ["name", "id"],
   ExportSpecifier: ["name", "id"],
   VariableDeclarator: ["id"],
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-default/actual.js b/test/fixtures/transformation/es6-modules-amd/imports-default/actual.js
index e67418654c..7a085cb1e3 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-default/actual.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-default/actual.js
@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
index 78a5151d3a..bcc4b497c9 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-default/expected.js
@@ -7,5 +7,5 @@ define(["exports", "foo"], function (exports, _foo) {
 
   var foo = _interopRequire(_foo);
 
-  var foo = _interopRequire(_foo);
-});
\ No newline at end of file
+  var foo2 = _interopRequire(_foo);
+});
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-named/actual.js b/test/fixtures/transformation/es6-modules-amd/imports-named/actual.js
index 83a766c62d..6d50813b6f 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-named/actual.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-named/actual.js
@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js b/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
index 5140508011..f1cbf26ee3 100644
--- a/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/imports-named/expected.js
@@ -2,9 +2,9 @@ define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var bar = _foo.bar;
-  var bar = _foo.bar;
+  var bar2 = _foo.bar2;
   var baz = _foo.baz;
-  var baz = _foo.bar;
-  var baz = _foo.bar;
+  var baz2 = _foo.bar;
+  var baz3 = _foo.bar;
   var xyz = _foo.xyz;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/es6-modules-amd/overview/actual.js b/test/fixtures/transformation/es6-modules-amd/overview/actual.js
index a77d4d5dfa..1623f8b61e 100644
--- a/test/fixtures/transformation/es6-modules-amd/overview/actual.js
+++ b/test/fixtures/transformation/es6-modules-amd/overview/actual.js
@@ -2,11 +2,11 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
-export var test = 5;
+export var test2 = 5;
 
 export default test;
diff --git a/test/fixtures/transformation/es6-modules-amd/overview/expected.js b/test/fixtures/transformation/es6-modules-amd/overview/expected.js
index d1c203ae88..96738fe38d 100644
--- a/test/fixtures/transformation/es6-modules-amd/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-amd/overview/expected.js
@@ -7,11 +7,11 @@ define(["exports", "module", "foo", "foo-bar", "./directory/foo-bar"], function
 
   var foo = _interopRequire(_foo);
 
-  var foo = _foo;
+  var foo2 = _foo;
   var bar = _foo.bar;
-  var bar = _foo.foo;
+  var bar2 = _foo.foo;
   exports.test = test;
-  var test = exports.test = 5;
+  var test2 = exports.test2 = 5;
 
   module.exports = test;
 });
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/actual.js
new file mode 100644
index 0000000000..f4d2ebe99a
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/actual.js
@@ -0,0 +1,2 @@
+import * as foo from "foo";
+foo = 1;
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-4/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/actual.js
new file mode 100644
index 0000000000..41d4752b52
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/actual.js
@@ -0,0 +1,2 @@
+import * as foo from "foo";
+var foo;
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-5/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/actual.js
new file mode 100644
index 0000000000..f0c5ef2439
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/actual.js
@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+var bar;
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-6/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/actual.js
new file mode 100644
index 0000000000..b3ce137015
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/actual.js
@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+bar = 1;
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-7/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/actual.js
new file mode 100644
index 0000000000..f2257a7a53
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/actual.js
@@ -0,0 +1,2 @@
+import { foo } from "foo";
+import { foo } from "bar";
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-8/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/actual.js b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/actual.js
new file mode 100644
index 0000000000..c58a0e64c5
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/actual.js
@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+import { foo as bar } from "bar";
diff --git a/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/options.json b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/options.json
new file mode 100644
index 0000000000..a9357a58d2
--- /dev/null
+++ b/test/fixtures/transformation/es6-modules-common/disallow-import-remapping-9/options.json
@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}
diff --git a/test/fixtures/transformation/es6-modules-common/imports-default/actual.js b/test/fixtures/transformation/es6-modules-common/imports-default/actual.js
index e67418654c..7a085cb1e3 100644
--- a/test/fixtures/transformation/es6-modules-common/imports-default/actual.js
+++ b/test/fixtures/transformation/es6-modules-common/imports-default/actual.js
@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common/imports-default/expected.js b/test/fixtures/transformation/es6-modules-common/imports-default/expected.js
index 2a84fb6d1e..02c8997cb6 100644
--- a/test/fixtures/transformation/es6-modules-common/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/imports-default/expected.js
@@ -6,4 +6,4 @@ var _interopRequire = function (obj) {
 
 var foo = _interopRequire(require("foo"));
 
-var foo = _interopRequire(require("foo"));
+var foo2 = _interopRequire(require("foo"));
diff --git a/test/fixtures/transformation/es6-modules-common/imports-named/actual.js b/test/fixtures/transformation/es6-modules-common/imports-named/actual.js
index 83a766c62d..6d50813b6f 100644
--- a/test/fixtures/transformation/es6-modules-common/imports-named/actual.js
+++ b/test/fixtures/transformation/es6-modules-common/imports-named/actual.js
@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-common/imports-named/expected.js b/test/fixtures/transformation/es6-modules-common/imports-named/expected.js
index 9a51dccc06..6fa7137b22 100644
--- a/test/fixtures/transformation/es6-modules-common/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/imports-named/expected.js
@@ -1,8 +1,8 @@
 "use strict";
 
 var bar = require("foo").bar;
-var bar = require("foo").bar;
+var bar2 = require("foo").bar2;
 var baz = require("foo").baz;
-var baz = require("foo").bar;
-var baz = require("foo").bar;
+var baz2 = require("foo").bar;
+var baz3 = require("foo").bar;
 var xyz = require("foo").xyz;
diff --git a/test/fixtures/transformation/es6-modules-common/overview/actual.js b/test/fixtures/transformation/es6-modules-common/overview/actual.js
index 36e32b3470..589b4bd8cc 100644
--- a/test/fixtures/transformation/es6-modules-common/overview/actual.js
+++ b/test/fixtures/transformation/es6-modules-common/overview/actual.js
@@ -2,9 +2,9 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
 export var test = 5;
diff --git a/test/fixtures/transformation/es6-modules-common/overview/expected.js b/test/fixtures/transformation/es6-modules-common/overview/expected.js
index 9ce11f0b0d..a15f34dd81 100644
--- a/test/fixtures/transformation/es6-modules-common/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-common/overview/expected.js
@@ -18,9 +18,9 @@ require("./directory/foo-bar");
 
 var foo = _interopRequire(require("foo"));
 
-var foo = _interopRequireWildcard(require("foo"));
+var foo2 = _interopRequireWildcard(require("foo"));
 
 var bar = require("foo").bar;
-var bar = require("foo").foo;
+var bar2 = require("foo").foo;
 exports.test = test;
 var test = exports.test = 5;
diff --git a/test/fixtures/transformation/es6-modules-ignore/imports-default/actual.js b/test/fixtures/transformation/es6-modules-ignore/imports-default/actual.js
index e67418654c..7a085cb1e3 100644
--- a/test/fixtures/transformation/es6-modules-ignore/imports-default/actual.js
+++ b/test/fixtures/transformation/es6-modules-ignore/imports-default/actual.js
@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-ignore/imports-named/actual.js b/test/fixtures/transformation/es6-modules-ignore/imports-named/actual.js
index 83a766c62d..6d50813b6f 100644
--- a/test/fixtures/transformation/es6-modules-ignore/imports-named/actual.js
+++ b/test/fixtures/transformation/es6-modules-ignore/imports-named/actual.js
@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-ignore/overview/actual.js b/test/fixtures/transformation/es6-modules-ignore/overview/actual.js
index a77d4d5dfa..1623f8b61e 100644
--- a/test/fixtures/transformation/es6-modules-ignore/overview/actual.js
+++ b/test/fixtures/transformation/es6-modules-ignore/overview/actual.js
@@ -2,11 +2,11 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
-export var test = 5;
+export var test2 = 5;
 
 export default test;
diff --git a/test/fixtures/transformation/es6-modules-ignore/overview/expected.js b/test/fixtures/transformation/es6-modules-ignore/overview/expected.js
index c930de5eae..5027345558 100644
--- a/test/fixtures/transformation/es6-modules-ignore/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-ignore/overview/expected.js
@@ -1,3 +1,3 @@
 "use strict";
 
-var test = 5;
+var test2 = 5;
diff --git a/test/fixtures/transformation/es6-modules-system/imports-default/actual.js b/test/fixtures/transformation/es6-modules-system/imports-default/actual.js
index e67418654c..7a085cb1e3 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-default/actual.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-default/actual.js
@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-system/imports-default/expected.js b/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
index 8164489973..16a71b2ed4 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-default/expected.js
@@ -1,12 +1,12 @@
 System.register(["foo"], function (_export) {
   "use strict";
 
-  var foo, foo;
+  var foo, foo2;
   return {
     setters: [function (_foo) {
       foo = _foo["default"];
-      foo = _foo["default"];
+      foo2 = _foo["default"];
     }],
     execute: function () {}
   };
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/es6-modules-system/imports-named/actual.js b/test/fixtures/transformation/es6-modules-system/imports-named/actual.js
index 83a766c62d..6d50813b6f 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-named/actual.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-named/actual.js
@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-system/imports-named/expected.js b/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
index 848c4a28ba..e6704667be 100644
--- a/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/imports-named/expected.js
@@ -1,16 +1,16 @@
 System.register(["foo"], function (_export) {
   "use strict";
 
-  var bar, bar, baz, baz, baz, xyz;
+  var bar, bar2, baz, baz2, baz3, xyz;
   return {
     setters: [function (_foo) {
       bar = _foo.bar;
-      bar = _foo.bar;
+      bar2 = _foo.bar2;
       baz = _foo.baz;
-      baz = _foo.bar;
-      baz = _foo.bar;
+      baz2 = _foo.bar;
+      baz3 = _foo.bar;
       xyz = _foo.xyz;
     }],
     execute: function () {}
   };
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/es6-modules-system/overview/actual.js b/test/fixtures/transformation/es6-modules-system/overview/actual.js
index a77d4d5dfa..1623f8b61e 100644
--- a/test/fixtures/transformation/es6-modules-system/overview/actual.js
+++ b/test/fixtures/transformation/es6-modules-system/overview/actual.js
@@ -2,11 +2,11 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
-export var test = 5;
+export var test2 = 5;
 
 export default test;
diff --git a/test/fixtures/transformation/es6-modules-system/overview/expected.js b/test/fixtures/transformation/es6-modules-system/overview/expected.js
index 59e6c96af2..538640f07d 100644
--- a/test/fixtures/transformation/es6-modules-system/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-system/overview/expected.js
@@ -1,19 +1,19 @@
 System.register(["foo", "foo-bar", "./directory/foo-bar"], function (_export) {
   "use strict";
 
-  var foo, foo, bar, bar, test;
+  var foo, foo2, bar, bar2, test2;
   return {
     setters: [function (_foo) {
       foo = _foo["default"];
-      foo = _foo;
+      foo2 = _foo;
       bar = _foo.bar;
-      bar = _foo.foo;
+      bar2 = _foo.foo;
     }, function (_fooBar) {}, function (_directoryFooBar) {}],
     execute: function () {
       _export("test", test);
 
-      test = _export("test", 5);
+      test2 = _export("test2", 5);
       _export("default", test);
     }
   };
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-default/actual.js b/test/fixtures/transformation/es6-modules-umd/imports-default/actual.js
index e67418654c..7a085cb1e3 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-default/actual.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-default/actual.js
@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
index f68f912f15..30aa739b11 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-default/expected.js
@@ -13,5 +13,5 @@
 
   var foo = _interopRequire(_foo);
 
-  var foo = _interopRequire(_foo);
-});
\ No newline at end of file
+  var foo2 = _interopRequire(_foo);
+});
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-named/actual.js b/test/fixtures/transformation/es6-modules-umd/imports-named/actual.js
index 83a766c62d..6d50813b6f 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-named/actual.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-named/actual.js
@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";
diff --git a/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js b/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
index 2d75892bf6..d4c162c172 100644
--- a/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/imports-named/expected.js
@@ -8,9 +8,9 @@
   "use strict";
 
   var bar = _foo.bar;
-  var bar = _foo.bar;
+  var bar2 = _foo.bar2;
   var baz = _foo.baz;
-  var baz = _foo.bar;
-  var baz = _foo.bar;
+  var baz2 = _foo.bar;
+  var baz3 = _foo.bar;
   var xyz = _foo.xyz;
-});
\ No newline at end of file
+});
diff --git a/test/fixtures/transformation/es6-modules-umd/overview/actual.js b/test/fixtures/transformation/es6-modules-umd/overview/actual.js
index a77d4d5dfa..1623f8b61e 100644
--- a/test/fixtures/transformation/es6-modules-umd/overview/actual.js
+++ b/test/fixtures/transformation/es6-modules-umd/overview/actual.js
@@ -2,11 +2,11 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
-export var test = 5;
+export var test2 = 5;
 
 export default test;
diff --git a/test/fixtures/transformation/es6-modules-umd/overview/expected.js b/test/fixtures/transformation/es6-modules-umd/overview/expected.js
index 73f835715e..2fa6264215 100644
--- a/test/fixtures/transformation/es6-modules-umd/overview/expected.js
+++ b/test/fixtures/transformation/es6-modules-umd/overview/expected.js
@@ -13,11 +13,11 @@
 
   var foo = _interopRequire(_foo);
 
-  var foo = _foo;
+  var foo2 = _foo;
   var bar = _foo.bar;
-  var bar = _foo.foo;
+  var bar2 = _foo.foo;
   exports.test = test;
-  var test = exports.test = 5;
+  var test2 = exports.test2 = 5;
 
   module.exports = test;
 });