diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 68ebd6772a9a2..32ea13b6338f7 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3091,31 +3091,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             }
 
             function emitExportMemberAssignments(name: Identifier) {
+                if (compilerOptions.module === ModuleKind.System) {
+                    return;
+                }
+                
                 if (!exportEquals && exportSpecifiers && hasProperty(exportSpecifiers, name.text)) {
                     for (let specifier of exportSpecifiers[name.text]) {
                         writeLine();
-                        if (compilerOptions.module === ModuleKind.System) {
-                            emitStart(specifier.name);
-                            write(`${exportFunctionForFile}("`);
-                            emitNodeWithoutSourceMap(specifier.name);
-                            write(`", `);
-                            emitExpressionIdentifier(name);
-                            write(")");
-                            emitEnd(specifier.name);
-                        }
-                        else {
-                            emitStart(specifier.name);
-                            emitContainingModuleName(specifier);
-                            write(".");
-                            emitNodeWithoutSourceMap(specifier.name);
-                            emitEnd(specifier.name);
-                            write(" = ");
-                            emitExpressionIdentifier(name);
-                        }
+                        emitStart(specifier.name);
+                        emitContainingModuleName(specifier);
+                        write(".");
+                        emitNodeWithoutSourceMap(specifier.name);
+                        emitEnd(specifier.name);
+                        write(" = ");
+                        emitExpressionIdentifier(name);
                         write(";");
                     }
                 }
             }
+            
+            function emitExportSpecifierInSystemModule(specifier: ExportSpecifier): void {
+                Debug.assert(compilerOptions.module === ModuleKind.System);
+                
+                writeLine();
+                emitStart(specifier.name);
+                write(`${exportFunctionForFile}("`);
+                emitNodeWithoutSourceMap(specifier.name);
+                write(`", `);
+                emitExpressionIdentifier(specifier.propertyName || specifier.name);
+                write(")");
+                emitEnd(specifier.name);
+                write(";");
+            }
 
             function emitDestructuring(root: BinaryExpression | VariableDeclaration | ParameterDeclaration, isAssignmentExpressionStatement: boolean, value?: Expression) {
                 let emitCount = 0;
@@ -6060,7 +6067,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return compilerOptions.module === ModuleKind.System && isExternalModule(currentSourceFile);
             }
 
-            function emitSystemModuleBody(node: SourceFile, startIndex: number): void {
+            function emitSystemModuleBody(node: SourceFile, dependencyGroups: DependencyGroup[], startIndex: number): void {
                 // shape of the body in system modules:
                 // function (exports) {
                 //     <list of local aliases for imports>
@@ -6105,7 +6112,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write("return {");
                 increaseIndent();
                 writeLine();
-                emitSetters(exportStarFunction);
+                emitSetters(exportStarFunction, dependencyGroups);
                 writeLine();
                 emitExecute(node, startIndex);
                 decreaseIndent();
@@ -6114,115 +6121,90 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitTempDeclarations(/*newLine*/ true);
             }
 
-            function emitSetters(exportStarFunction: string) {
+            function emitSetters(exportStarFunction: string, dependencyGroups: DependencyGroup[]) {
                 write("setters:[");
-                for (let i = 0; i < externalImports.length; ++i) {
+                
+                for (let i = 0; i < dependencyGroups.length; ++i) {
                     if (i !== 0) {
                         write(",");
                     }
 
                     writeLine();
                     increaseIndent();
-                    let importNode = externalImports[i];
-                    let importVariableName = getLocalNameForExternalImport(importNode) || "";
-                    let parameterName = "_" + importVariableName;
+                    
+                    let group = dependencyGroups[i];
+                    
+                    // derive a unique name for parameter from the first named entry in the group
+                    let parameterName = makeUniqueName(forEach(group, getLocalNameForExternalImport) || "");
                     write(`function (${parameterName}) {`);
+                    increaseIndent();
+                    
+                    for(let entry of group) {
+                        let importVariableName = getLocalNameForExternalImport(entry) || "";
+                        
+                        switch (entry.kind) {
+                            case SyntaxKind.ImportDeclaration:
+                                if (!(<ImportDeclaration>entry).importClause) {
+                                    // 'import "..."' case
+                                    // module is imported only for side-effects, no emit required
+                                    break;
+                                }
+                            // fall-through
+                            case SyntaxKind.ImportEqualsDeclaration:
+                                Debug.assert(importVariableName !== "");
 
-                    switch (importNode.kind) {
-                        case SyntaxKind.ImportDeclaration:
-                            if (!(<ImportDeclaration>importNode).importClause) {
-                                // 'import "..."' case
-                                // module is imported only for side-effects, setter body will be empty
-                                break;
-                            }
-                        // fall-through
-                        case SyntaxKind.ImportEqualsDeclaration:
-                            Debug.assert(importVariableName !== "");
-
-                            increaseIndent();
-                            writeLine();
-                            // save import into the local
-                            write(`${importVariableName} = ${parameterName};`);
-                            writeLine();
-
-                            let defaultName =
-                                importNode.kind === SyntaxKind.ImportDeclaration
-                                    ? (<ImportDeclaration>importNode).importClause.name
-                                    : (<ImportEqualsDeclaration>importNode).name;
-
-                            if (defaultName) {
-                                // emit re-export for imported default name
-                                // import n1 from 'foo1'
-                                // import n2 = require('foo2')
-                                // export {n1}
-                                // export {n2}
-                                emitExportMemberAssignments(defaultName);
                                 writeLine();
-                            }
-
-                            if (importNode.kind === SyntaxKind.ImportDeclaration &&
-                                (<ImportDeclaration>importNode).importClause.namedBindings) {
-
-                                let namedBindings = (<ImportDeclaration>importNode).importClause.namedBindings;
-                                if (namedBindings.kind === SyntaxKind.NamespaceImport) {
-                                    // emit re-export for namespace
-                                    // import * as n from 'foo'
-                                    // export {n}
-                                    emitExportMemberAssignments((<NamespaceImport>namedBindings).name);
+                                // save import into the local
+                                write(`${importVariableName} = ${parameterName};`);
+                                writeLine();
+                                break;
+                            case SyntaxKind.ExportDeclaration:
+                                Debug.assert(importVariableName !== "");
+
+                                if ((<ExportDeclaration>entry).exportClause) {
+                                    // export {a, b as c} from 'foo'
+                                    // emit as:
+                                    // exports_({
+                                    //    "a": _["a"],
+                                    //    "c": _["b"]
+                                    // });
                                     writeLine();
-                                }
-                                else {
-                                    // emit re-exports for named imports
-                                    // import {a, b} from 'foo'
-                                    // export {a, b as c}
-                                    for (let element of (<NamedImports>namedBindings).elements) {
-                                        emitExportMemberAssignments(element.name || element.propertyName);
-                                        writeLine();
+                                    write(`${exportFunctionForFile}({`);
+                                    writeLine();
+                                    increaseIndent();
+                                    for (let i = 0, len = (<ExportDeclaration>entry).exportClause.elements.length; i < len; ++i) {
+                                        if (i !== 0) {
+                                            write(",");
+                                            writeLine();
+                                        }
+                                        
+                                        let e = (<ExportDeclaration>entry).exportClause.elements[i];
+                                        write(`"`);
+                                        emitNodeWithoutSourceMap(e.name);
+                                        write(`": ${parameterName}["`);
+                                        emitNodeWithoutSourceMap(e.propertyName || e.name);
+                                        write(`"]`);
                                     }
+                                    decreaseIndent();
+                                    writeLine();
+                                    write("});")
                                 }
-                            }
-
-                            decreaseIndent();
-                            break;
-                        case SyntaxKind.ExportDeclaration:
-                            Debug.assert(importVariableName !== "");
-
-                            increaseIndent();
-
-                            if ((<ExportDeclaration>importNode).exportClause) {
-                                // export {a, b as c} from 'foo'
-                                // emit as:
-                                // var reexports = {}
-                                // reexports['a'] = _foo["a"];
-                                // reexports['c'] = _foo["b"];
-                                // exports_(reexports);
-                                let reexportsVariableName = makeUniqueName("reexports");
-                                writeLine();
-                                write(`var ${reexportsVariableName} = {};`);
-                                writeLine();
-                                for (let e of (<ExportDeclaration>importNode).exportClause.elements) {
-                                    write(`${reexportsVariableName}["`);
-                                    emitNodeWithoutSourceMap(e.name);
-                                    write(`"] = ${parameterName}["`);
-                                    emitNodeWithoutSourceMap(e.propertyName || e.name);
-                                    write(`"];`);
+                                else {
                                     writeLine();
+                                    // export * from 'foo'
+                                    // emit as:
+                                    // exportStar(_foo);
+                                    write(`${exportStarFunction}(${parameterName});`);
                                 }
-                                write(`${exportFunctionForFile}(${reexportsVariableName});`);
-                            }
-                            else {
+
                                 writeLine();
-                                // export * from 'foo'
-                                // emit as:
-                                // exportStar(_foo);
-                                write(`${exportStarFunction}(${parameterName});`);
-                            }
+                                break;
+                        }
 
-                            writeLine();
-                            decreaseIndent();
-                            break;
                     }
 
+                    decreaseIndent();
+
                     write("}");
                     decreaseIndent();
                 }
@@ -6235,26 +6217,40 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 writeLine();
                 for (let i = startIndex; i < node.statements.length; ++i) {
                     let statement = node.statements[i];
-                    // - external module related imports/exports are not emitted for system modules
-                    // - function declarations are not emitted because they were already hoisted
                     switch (statement.kind) {
-                        case SyntaxKind.ExportDeclaration:
+                        // - function declarations are not emitted because they were already hoisted
+                        // - import declarations are not emitted since they are already handled in setters
+                        // - export declarations with module specifiers are not emitted since they were already written in setters
+                        // - export declarations without module specifiers are emitted preserving the order
+                        case SyntaxKind.FunctionDeclaration:                        
                         case SyntaxKind.ImportDeclaration:
-                        case SyntaxKind.FunctionDeclaration:
+                            continue;
+                        case SyntaxKind.ExportDeclaration:
+                            if (!(<ExportDeclaration>statement).moduleSpecifier) {
+                                for (let element of (<ExportDeclaration>statement).exportClause.elements) {
+                                    // write call to exporter function for every export specifier in exports list
+                                    emitExportSpecifierInSystemModule(element);
+                                }
+                            }
                             continue;
                         case SyntaxKind.ImportEqualsDeclaration:
                             if (!isInternalModuleImportEqualsDeclaration(statement)) {
+                                // - import equals declarations that import external modules are not emitted
                                 continue;
                             }
-                    }
-                    writeLine();
-                    emit(statement);
+                            // fall-though for import declarations that import internal modules
+                        default:
+                            writeLine();
+                            emit(statement);
+                    }                    
                 }
                 decreaseIndent();
                 writeLine();
                 write("}"); // execute
             }
-
+            
+            type DependencyGroup = Array<ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration>;
+            
             function emitSystemModule(node: SourceFile, startIndex: number): void {
                 collectExternalModuleInfo(node);
                 // System modules has the following shape
@@ -6274,8 +6270,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     write(`"${node.moduleName}", `);
                 }
                 write("[");
+                
+                let groupIndices: Map<number> = {};
+                let dependencyGroups: DependencyGroup[] = [];
+
                 for (let i = 0; i < externalImports.length; ++i) {
                     let text = getExternalModuleNameText(externalImports[i]);
+                    if (hasProperty(groupIndices, text)) {
+                        // deduplicate/group entries in dependency list by the dependency name
+                        let groupIndex = groupIndices[text];
+                        dependencyGroups[groupIndex].push(externalImports[i]);
+                        continue;
+                    }
+                    else {
+                        groupIndices[text] = dependencyGroups.length;
+                        dependencyGroups.push([externalImports[i]]);
+                    }
+                    
                     if (i !== 0) {
                         write(", ");
                     }
@@ -6286,7 +6297,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 increaseIndent();
                 emitEmitHelpers(node);
                 emitCaptureThisForNodeIfNecessary(node);
-                emitSystemModuleBody(node, startIndex);
+                emitSystemModuleBody(node, dependencyGroups, startIndex);
                 decreaseIndent();
                 writeLine();
                 write("});");
diff --git a/tests/baselines/reference/aliasesInSystemModule1.js b/tests/baselines/reference/aliasesInSystemModule1.js
index 28ac1e9b4adea..05f74aef85266 100644
--- a/tests/baselines/reference/aliasesInSystemModule1.js
+++ b/tests/baselines/reference/aliasesInSystemModule1.js
@@ -22,8 +22,8 @@ System.register(['foo'], function(exports_1) {
     var cls, cls2, x, y, z, M;
     return {
         setters:[
-            function (_alias) {
-                alias = _alias;
+            function (alias_1) {
+                alias = alias_1;
             }],
         execute: function() {
             cls = alias.Class;
diff --git a/tests/baselines/reference/aliasesInSystemModule2.js b/tests/baselines/reference/aliasesInSystemModule2.js
index 0256d03a179e8..32d663a11e145 100644
--- a/tests/baselines/reference/aliasesInSystemModule2.js
+++ b/tests/baselines/reference/aliasesInSystemModule2.js
@@ -21,8 +21,8 @@ System.register(["foo"], function(exports_1) {
     var cls, cls2, x, y, z, M;
     return {
         setters:[
-            function (_foo_1) {
-                foo_1 = _foo_1;
+            function (foo_1_1) {
+                foo_1 = foo_1_1;
             }],
         execute: function() {
             cls = foo_1.alias.Class;
diff --git a/tests/baselines/reference/systemModule10.js b/tests/baselines/reference/systemModule10.js
index c63b3589085a2..fcecfc9b0f87d 100644
--- a/tests/baselines/reference/systemModule10.js
+++ b/tests/baselines/reference/systemModule10.js
@@ -14,19 +14,19 @@ System.register(['file1', 'file2'], function(exports_1) {
     var file1_1, n2;
     return {
         setters:[
-            function (_file1_1) {
-                file1_1 = _file1_1;
-                exports_1("n", file1_1["default"]);
-                exports_1("n1", file1_1["default"]);
-                exports_1("x", file1_1.x);
-                exports_1("y", file1_1.x);
+            function (file1_1_1) {
+                file1_1 = file1_1_1;
             },
-            function (_n2) {
-                n2 = _n2;
-                exports_1("n2", n2);
-                exports_1("n3", n2);
+            function (n2_1) {
+                n2 = n2_1;
             }],
         execute: function() {
+            exports_1("x", file1_1.x);
+            exports_1("y", file1_1.x);
+            exports_1("n", file1_1["default"]);
+            exports_1("n1", file1_1["default"]);
+            exports_1("n2", n2);
+            exports_1("n3", n2);
         }
     }
 });
diff --git a/tests/baselines/reference/systemModule10_ES5.js b/tests/baselines/reference/systemModule10_ES5.js
index bdb920414de3e..a86088a3463fb 100644
--- a/tests/baselines/reference/systemModule10_ES5.js
+++ b/tests/baselines/reference/systemModule10_ES5.js
@@ -14,19 +14,19 @@ System.register(['file1', 'file2'], function(exports_1) {
     var file1_1, n2;
     return {
         setters:[
-            function (_file1_1) {
-                file1_1 = _file1_1;
-                exports_1("n", file1_1.default);
-                exports_1("n1", file1_1.default);
-                exports_1("x", file1_1.x);
-                exports_1("y", file1_1.x);
+            function (file1_1_1) {
+                file1_1 = file1_1_1;
             },
-            function (_n2) {
-                n2 = _n2;
-                exports_1("n2", n2);
-                exports_1("n3", n2);
+            function (n2_1) {
+                n2 = n2_1;
             }],
         execute: function() {
+            exports_1("x", file1_1.x);
+            exports_1("y", file1_1.x);
+            exports_1("n", file1_1.default);
+            exports_1("n1", file1_1.default);
+            exports_1("n2", n2);
+            exports_1("n3", n2);
         }
     }
 });
diff --git a/tests/baselines/reference/systemModule11.js b/tests/baselines/reference/systemModule11.js
index 34dd0d3df5fa0..bf9b57c511cc2 100644
--- a/tests/baselines/reference/systemModule11.js
+++ b/tests/baselines/reference/systemModule11.js
@@ -59,8 +59,8 @@ System.register(['bar'], function(exports_1) {
     }
     return {
         setters:[
-            function (_bar_1) {
-                exportStar_1(_bar_1);
+            function (bar_1_1) {
+                exportStar_1(bar_1_1);
             }],
         execute: function() {
         }
@@ -82,8 +82,8 @@ System.register(['bar'], function(exports_1) {
     }
     return {
         setters:[
-            function (_bar_1) {
-                exportStar_1(_bar_1);
+            function (bar_1_1) {
+                exportStar_1(bar_1_1);
             }],
         execute: function() {
             exports_1("x", x);
@@ -108,14 +108,14 @@ System.register(['a', 'bar'], function(exports_1) {
     }
     return {
         setters:[
-            function (_a_1) {
-                var reexports_1 = {};
-                reexports_1["x"] = _a_1["x"];
-                reexports_1["z"] = _a_1["y"];
-                exports_1(reexports_1);
+            function (a_1_1) {
+                exports_1({
+                    "x": a_1_1["x"],
+                    "z": a_1_1["y"]
+                });
             },
-            function (_bar_1) {
-                exportStar_1(_bar_1);
+            function (bar_1_1) {
+                exportStar_1(bar_1_1);
             }],
         execute: function() {
         }
@@ -130,11 +130,11 @@ System.register(['a'], function(exports_1) {
     exports_1("default", default_1);
     return {
         setters:[
-            function (_a_1) {
-                var reexports_1 = {};
-                reexports_1["s"] = _a_1["s"];
-                reexports_1["s2"] = _a_1["s1"];
-                exports_1(reexports_1);
+            function (a_1_1) {
+                exports_1({
+                    "s": a_1_1["s"],
+                    "s2": a_1_1["s1"]
+                });
             }],
         execute: function() {
             exports_1("z", z);
@@ -154,8 +154,8 @@ System.register(['a'], function(exports_1) {
     }
     return {
         setters:[
-            function (_a_1) {
-                exportStar_1(_a_1);
+            function (a_1_1) {
+                exportStar_1(a_1_1);
             }],
         execute: function() {
         }
diff --git a/tests/baselines/reference/systemModule14.errors.txt b/tests/baselines/reference/systemModule14.errors.txt
new file mode 100644
index 0000000000000..6ba64896df8a5
--- /dev/null
+++ b/tests/baselines/reference/systemModule14.errors.txt
@@ -0,0 +1,16 @@
+tests/cases/compiler/systemModule14.ts(6,17): error TS2307: Cannot find module 'foo'.
+
+
+==== tests/cases/compiler/systemModule14.ts (1 errors) ====
+    
+    function foo() {
+        return a;
+    }
+    
+    import {a} from "foo";
+                    ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    export {foo}
+    
+    var x = 1;
+    export {foo as b}
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule14.js b/tests/baselines/reference/systemModule14.js
new file mode 100644
index 0000000000000..76906db5980fc
--- /dev/null
+++ b/tests/baselines/reference/systemModule14.js
@@ -0,0 +1,31 @@
+//// [systemModule14.ts]
+
+function foo() {
+    return a;
+}
+
+import {a} from "foo";
+export {foo}
+
+var x = 1;
+export {foo as b}
+
+//// [systemModule14.js]
+System.register(["foo"], function(exports_1) {
+    var foo_1;
+    var x;
+    function foo() {
+        return foo_1.a;
+    }
+    return {
+        setters:[
+            function (foo_1_1) {
+                foo_1 = foo_1_1;
+            }],
+        execute: function() {
+            exports_1("foo", foo);
+            x = 1;
+            exports_1("b", foo);
+        }
+    }
+});
diff --git a/tests/baselines/reference/systemModule15.js b/tests/baselines/reference/systemModule15.js
new file mode 100644
index 0000000000000..4d5536cbaa101
--- /dev/null
+++ b/tests/baselines/reference/systemModule15.js
@@ -0,0 +1,88 @@
+//// [tests/cases/compiler/systemModule15.ts] ////
+
+//// [file1.ts]
+
+
+import * as moduleB from "./file2"
+
+declare function use(v: any): void;
+
+use(moduleB.value);
+use(moduleB.moduleC);
+use(moduleB.moduleCStar);
+
+//// [file2.ts]
+
+import * as moduleCStar from "./file3"
+import {value2} from "./file4"
+import moduleC from "./file3"
+import {value} from "./file3"
+
+export {
+    moduleCStar,
+    moduleC,
+    value
+}
+
+//// [file3.ts]
+
+export var value = "youpi";
+export default value;
+
+//// [file4.ts]
+
+export var value2 = "v";
+
+//// [file3.js]
+System.register([], function(exports_1) {
+    var value;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("value", value = "youpi");
+            exports_1("default",value);
+        }
+    }
+});
+//// [file4.js]
+System.register([], function(exports_1) {
+    var value2;
+    return {
+        setters:[],
+        execute: function() {
+            exports_1("value2", value2 = "v");
+        }
+    }
+});
+//// [file2.js]
+System.register(["./file3"], function(exports_1) {
+    var moduleCStar, file3_1, file3_2;
+    return {
+        setters:[
+            function (moduleCStar_1) {
+                moduleCStar = moduleCStar_1;
+                file3_1 = moduleCStar_1;
+                file3_2 = moduleCStar_1;
+            }],
+        execute: function() {
+            exports_1("moduleCStar", moduleCStar);
+            exports_1("moduleC", file3_1["default"]);
+            exports_1("value", file3_2.value);
+        }
+    }
+});
+//// [file1.js]
+System.register(["./file2"], function(exports_1) {
+    var moduleB;
+    return {
+        setters:[
+            function (moduleB_1) {
+                moduleB = moduleB_1;
+            }],
+        execute: function() {
+            use(moduleB.value);
+            use(moduleB.moduleC);
+            use(moduleB.moduleCStar);
+        }
+    }
+});
diff --git a/tests/baselines/reference/systemModule15.symbols b/tests/baselines/reference/systemModule15.symbols
new file mode 100644
index 0000000000000..2572950a7f2e0
--- /dev/null
+++ b/tests/baselines/reference/systemModule15.symbols
@@ -0,0 +1,66 @@
+=== tests/cases/compiler/file1.ts ===
+
+
+import * as moduleB from "./file2"
+>moduleB : Symbol(moduleB, Decl(file1.ts, 2, 6))
+
+declare function use(v: any): void;
+>use : Symbol(use, Decl(file1.ts, 2, 34))
+>v : Symbol(v, Decl(file1.ts, 4, 21))
+
+use(moduleB.value);
+>use : Symbol(use, Decl(file1.ts, 2, 34))
+>moduleB.value : Symbol(moduleB.value, Decl(file2.ts, 8, 12))
+>moduleB : Symbol(moduleB, Decl(file1.ts, 2, 6))
+>value : Symbol(moduleB.value, Decl(file2.ts, 8, 12))
+
+use(moduleB.moduleC);
+>use : Symbol(use, Decl(file1.ts, 2, 34))
+>moduleB.moduleC : Symbol(moduleB.moduleC, Decl(file2.ts, 7, 16))
+>moduleB : Symbol(moduleB, Decl(file1.ts, 2, 6))
+>moduleC : Symbol(moduleB.moduleC, Decl(file2.ts, 7, 16))
+
+use(moduleB.moduleCStar);
+>use : Symbol(use, Decl(file1.ts, 2, 34))
+>moduleB.moduleCStar : Symbol(moduleB.moduleCStar, Decl(file2.ts, 6, 8))
+>moduleB : Symbol(moduleB, Decl(file1.ts, 2, 6))
+>moduleCStar : Symbol(moduleB.moduleCStar, Decl(file2.ts, 6, 8))
+
+=== tests/cases/compiler/file2.ts ===
+
+import * as moduleCStar from "./file3"
+>moduleCStar : Symbol(moduleCStar, Decl(file2.ts, 1, 6))
+
+import {value2} from "./file4"
+>value2 : Symbol(value2, Decl(file2.ts, 2, 8))
+
+import moduleC from "./file3"
+>moduleC : Symbol(moduleC, Decl(file2.ts, 3, 6))
+
+import {value} from "./file3"
+>value : Symbol(value, Decl(file2.ts, 4, 8))
+
+export {
+    moduleCStar,
+>moduleCStar : Symbol(moduleCStar, Decl(file2.ts, 6, 8))
+
+    moduleC,
+>moduleC : Symbol(moduleC, Decl(file2.ts, 7, 16))
+
+    value
+>value : Symbol(value, Decl(file2.ts, 8, 12))
+}
+
+=== tests/cases/compiler/file3.ts ===
+
+export var value = "youpi";
+>value : Symbol(value, Decl(file3.ts, 1, 10))
+
+export default value;
+>value : Symbol(value, Decl(file3.ts, 1, 10))
+
+=== tests/cases/compiler/file4.ts ===
+
+export var value2 = "v";
+>value2 : Symbol(value2, Decl(file4.ts, 1, 10))
+
diff --git a/tests/baselines/reference/systemModule15.types b/tests/baselines/reference/systemModule15.types
new file mode 100644
index 0000000000000..502638dab93bf
--- /dev/null
+++ b/tests/baselines/reference/systemModule15.types
@@ -0,0 +1,71 @@
+=== tests/cases/compiler/file1.ts ===
+
+
+import * as moduleB from "./file2"
+>moduleB : typeof moduleB
+
+declare function use(v: any): void;
+>use : (v: any) => void
+>v : any
+
+use(moduleB.value);
+>use(moduleB.value) : void
+>use : (v: any) => void
+>moduleB.value : string
+>moduleB : typeof moduleB
+>value : string
+
+use(moduleB.moduleC);
+>use(moduleB.moduleC) : void
+>use : (v: any) => void
+>moduleB.moduleC : string
+>moduleB : typeof moduleB
+>moduleC : string
+
+use(moduleB.moduleCStar);
+>use(moduleB.moduleCStar) : void
+>use : (v: any) => void
+>moduleB.moduleCStar : typeof 
+>moduleB : typeof moduleB
+>moduleCStar : typeof 
+
+=== tests/cases/compiler/file2.ts ===
+
+import * as moduleCStar from "./file3"
+>moduleCStar : typeof moduleCStar
+
+import {value2} from "./file4"
+>value2 : string
+
+import moduleC from "./file3"
+>moduleC : string
+
+import {value} from "./file3"
+>value : string
+
+export {
+    moduleCStar,
+>moduleCStar : typeof moduleCStar
+
+    moduleC,
+>moduleC : string
+
+    value
+>value : string
+}
+
+=== tests/cases/compiler/file3.ts ===
+
+export var value = "youpi";
+>value : string
+>"youpi" : string
+
+export default value;
+>value : string
+
+=== tests/cases/compiler/file4.ts ===
+
+export var value2 = "v";
+>value2 : string
+>"v" : string
+
diff --git a/tests/baselines/reference/systemModule16.errors.txt b/tests/baselines/reference/systemModule16.errors.txt
new file mode 100644
index 0000000000000..8c79c9218e4cd
--- /dev/null
+++ b/tests/baselines/reference/systemModule16.errors.txt
@@ -0,0 +1,33 @@
+tests/cases/compiler/systemModule16.ts(2,20): error TS2307: Cannot find module 'foo'.
+tests/cases/compiler/systemModule16.ts(3,20): error TS2307: Cannot find module 'bar'.
+tests/cases/compiler/systemModule16.ts(4,15): error TS2307: Cannot find module 'foo'.
+tests/cases/compiler/systemModule16.ts(5,15): error TS2307: Cannot find module 'bar'.
+tests/cases/compiler/systemModule16.ts(8,32): error TS2307: Cannot find module 'foo'.
+tests/cases/compiler/systemModule16.ts(9,32): error TS2307: Cannot find module 'bar'.
+
+
+==== tests/cases/compiler/systemModule16.ts (6 errors) ====
+    
+    import * as x from "foo";
+                       ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    import * as y from "bar";
+                       ~~~~~
+!!! error TS2307: Cannot find module 'bar'.
+    export * from "foo";
+                  ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    export * from "bar"
+                  ~~~~~
+!!! error TS2307: Cannot find module 'bar'.
+    export {x}
+    export {y}
+    import {a1, b1, c1 as d1} from "foo";
+                                   ~~~~~
+!!! error TS2307: Cannot find module 'foo'.
+    export {a2, b2, c2 as d2} from "bar";
+                                   ~~~~~
+!!! error TS2307: Cannot find module 'bar'.
+    
+    x,y,a1,b1,d1;
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/systemModule16.js b/tests/baselines/reference/systemModule16.js
new file mode 100644
index 0000000000000..851b941492a4e
--- /dev/null
+++ b/tests/baselines/reference/systemModule16.js
@@ -0,0 +1,54 @@
+//// [systemModule16.ts]
+
+import * as x from "foo";
+import * as y from "bar";
+export * from "foo";
+export * from "bar"
+export {x}
+export {y}
+import {a1, b1, c1 as d1} from "foo";
+export {a2, b2, c2 as d2} from "bar";
+
+x,y,a1,b1,d1;
+
+
+//// [systemModule16.js]
+System.register(["foo", "bar"], function(exports_1) {
+    var x, y, foo_1;
+    var exportedNames_1 = {
+        'x': true,
+        'y': true,
+        'a2': true,
+        'b2': true,
+        'd2': true
+    };
+    function exportStar_1(m) {
+        var exports = {};
+        for(var n in m) {
+            if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n];
+        }
+        exports_1(exports);
+    }
+    return {
+        setters:[
+            function (x_1) {
+                x = x_1;
+                exportStar_1(x_1);
+                foo_1 = x_1;
+            },
+            function (y_1) {
+                y = y_1;
+                exportStar_1(y_1);
+                exports_1({
+                    "a2": y_1["a2"],
+                    "b2": y_1["b2"],
+                    "d2": y_1["c2"]
+                });
+            }],
+        execute: function() {
+            exports_1("x", x);
+            exports_1("y", y);
+            x, y, foo_1.a1, foo_1.b1, foo_1.c1;
+        }
+    }
+});
diff --git a/tests/baselines/reference/systemModule9.js b/tests/baselines/reference/systemModule9.js
index c282a47b686cd..d7913f2f8b73e 100644
--- a/tests/baselines/reference/systemModule9.js
+++ b/tests/baselines/reference/systemModule9.js
@@ -38,24 +38,24 @@ System.register(['file1', 'file2', 'file3', 'file4', 'file5', 'file6', 'file7'],
     }
     return {
         setters:[
-            function (_ns) {
-                ns = _ns;
+            function (ns_1) {
+                ns = ns_1;
             },
-            function (_file2_1) {
-                file2_1 = _file2_1;
+            function (file2_1_1) {
+                file2_1 = file2_1_1;
             },
-            function (_file3_1) {
-                file3_1 = _file3_1;
+            function (file3_1_1) {
+                file3_1 = file3_1_1;
             },
-            function (_) {},
-            function (_file5_1) {
-                file5_1 = _file5_1;
+            function (_1) {},
+            function (file5_1_1) {
+                file5_1 = file5_1_1;
             },
-            function (_ns3) {
-                ns3 = _ns3;
+            function (ns3_1) {
+                ns3 = ns3_1;
             },
-            function (_file7_1) {
-                exportStar_1(_file7_1);
+            function (file7_1_1) {
+                exportStar_1(file7_1_1);
             }],
         execute: function() {
             ns.f();
diff --git a/tests/baselines/reference/systemModuleWithSuperClass.js b/tests/baselines/reference/systemModuleWithSuperClass.js
index 3484606ee0e4c..9d1e87fbc662d 100644
--- a/tests/baselines/reference/systemModuleWithSuperClass.js
+++ b/tests/baselines/reference/systemModuleWithSuperClass.js
@@ -38,8 +38,8 @@ System.register(['./foo'], function(exports_1) {
     var Bar;
     return {
         setters:[
-            function (_foo_1) {
-                foo_1 = _foo_1;
+            function (foo_1_1) {
+                foo_1 = foo_1_1;
             }],
         execute: function() {
             Bar = (function (_super) {
diff --git a/tests/cases/compiler/systemModule14.ts b/tests/cases/compiler/systemModule14.ts
new file mode 100644
index 0000000000000..91192cec74a0a
--- /dev/null
+++ b/tests/cases/compiler/systemModule14.ts
@@ -0,0 +1,12 @@
+// @module: system
+// @isolatedModules: true
+
+function foo() {
+    return a;
+}
+
+import {a} from "foo";
+export {foo}
+
+var x = 1;
+export {foo as b}
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModule15.ts b/tests/cases/compiler/systemModule15.ts
new file mode 100644
index 0000000000000..2c29f0a5d20b2
--- /dev/null
+++ b/tests/cases/compiler/systemModule15.ts
@@ -0,0 +1,34 @@
+// @module: system
+// @isolatedModules: true
+
+// @filename: file1.ts
+
+import * as moduleB from "./file2"
+
+declare function use(v: any): void;
+
+use(moduleB.value);
+use(moduleB.moduleC);
+use(moduleB.moduleCStar);
+
+// @filename: file2.ts
+
+import * as moduleCStar from "./file3"
+import {value2} from "./file4"
+import moduleC from "./file3"
+import {value} from "./file3"
+
+export {
+    moduleCStar,
+    moduleC,
+    value
+}
+
+// @filename: file3.ts
+
+export var value = "youpi";
+export default value;
+
+// @filename: file4.ts
+
+export var value2 = "v";
\ No newline at end of file
diff --git a/tests/cases/compiler/systemModule16.ts b/tests/cases/compiler/systemModule16.ts
new file mode 100644
index 0000000000000..ba64bd32b5967
--- /dev/null
+++ b/tests/cases/compiler/systemModule16.ts
@@ -0,0 +1,13 @@
+// @module: system
+// @isolatedModules: true
+
+import * as x from "foo";
+import * as y from "bar";
+export * from "foo";
+export * from "bar"
+export {x}
+export {y}
+import {a1, b1, c1 as d1} from "foo";
+export {a2, b2, c2 as d2} from "bar";
+
+x,y,a1,b1,d1;