From 39d9720dd1bfd0554c383e3de9b876b044ebac66 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 16 Apr 2015 14:54:47 -0700
Subject: [PATCH 1/6] wire module lookcups for default import in ambient module
 declarations

---
 src/compiler/checker.ts                       |  3 +-
 .../diagnosticInformationMap.generated.ts     |  1 +
 src/compiler/utilities.ts                     |  2 +-
 .../es5ExportDefaultClassDeclaration4.js      | 28 +++++++++++++++++++
 .../es5ExportDefaultClassDeclaration4.symbols | 25 +++++++++++++++++
 .../es5ExportDefaultClassDeclaration4.types   | 25 +++++++++++++++++
 .../es5ExportDefaultFunctionDeclaration4.js   | 19 +++++++++++++
 ...5ExportDefaultFunctionDeclaration4.symbols | 15 ++++++++++
 ...es5ExportDefaultFunctionDeclaration4.types | 15 ++++++++++
 .../es5ExportDefaultClassDeclaration4.ts      | 16 +++++++++++
 .../es5ExportDefaultFunctionDeclaration4.ts   | 11 ++++++++
 11 files changed, 158 insertions(+), 2 deletions(-)
 create mode 100644 tests/baselines/reference/es5ExportDefaultClassDeclaration4.js
 create mode 100644 tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
 create mode 100644 tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
 create mode 100644 tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.js
 create mode 100644 tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
 create mode 100644 tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
 create mode 100644 tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts
 create mode 100644 tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 48d5dc1a149..838933f26e6 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -349,7 +349,8 @@ module ts {
                             }
                             result = undefined;
                         }
-                        else if (location.kind === SyntaxKind.SourceFile) {
+                        else if (location.kind === SyntaxKind.SourceFile ||
+                            (location.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>location).name.kind === SyntaxKind.StringLiteral)) {
                             result = getSymbol(getSymbolOfNode(location).exports, "default", meaning & SymbolFlags.ModuleMember);
                             let localSymbol = getLocalSymbolForExportDefault(result);
                             if (result && (result.flags & meaning) && localSymbol && localSymbol.name === name) {
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 570be357326..851b90f61c8 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -1,5 +1,6 @@
 // <auto-generated />
 /// <reference path="types.ts" />
+/* @internal */
 module ts {
     export var Diagnostics = {
         Unterminated_string_literal: { code: 1002, category: DiagnosticCategory.Error, key: "Unterminated string literal." },
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 02fae4be6de..0f2bd5daba5 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1913,4 +1913,4 @@ module ts {
 
         return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength:*/ newEndN - oldStartN);
     }
-}
+}
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.js b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.js
new file mode 100644
index 00000000000..118367dd111
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.js
@@ -0,0 +1,28 @@
+//// [es5ExportDefaultClassDeclaration4.ts]
+
+declare module "foo" {
+    export var before: C;
+
+    export default class C {
+        method(): C;
+    }
+
+    export var after: C;
+
+    export var t: typeof C;
+}
+
+
+
+//// [es5ExportDefaultClassDeclaration4.js]
+
+
+//// [es5ExportDefaultClassDeclaration4.d.ts]
+declare module "foo" {
+    var before: C;
+    class C {
+        method(): C;
+    }
+    var after: C;
+    var t: typeof C;
+}
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
new file mode 100644
index 00000000000..6c30ffed858
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.symbols
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts ===
+
+declare module "foo" {
+    export var before: C;
+>before : Symbol(before, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 14))
+>C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
+
+    export default class C {
+>C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
+
+        method(): C;
+>method : Symbol(method, Decl(es5ExportDefaultClassDeclaration4.ts, 4, 28))
+>C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
+    }
+
+    export var after: C;
+>after : Symbol(after, Decl(es5ExportDefaultClassDeclaration4.ts, 8, 14))
+>C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
+
+    export var t: typeof C;
+>t : Symbol(t, Decl(es5ExportDefaultClassDeclaration4.ts, 10, 14))
+>C : Symbol(C, Decl(es5ExportDefaultClassDeclaration4.ts, 2, 25))
+}
+
+
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
new file mode 100644
index 00000000000..de27b4b5fb0
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts ===
+
+declare module "foo" {
+    export var before: C;
+>before : C
+>C : C
+
+    export default class C {
+>C : C
+
+        method(): C;
+>method : () => C
+>C : C
+    }
+
+    export var after: C;
+>after : C
+>C : C
+
+    export var t: typeof C;
+>t : typeof C
+>C : typeof C
+}
+
+
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.js
new file mode 100644
index 00000000000..a8bdc7d79ef
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.js
@@ -0,0 +1,19 @@
+//// [es5ExportDefaultFunctionDeclaration4.ts]
+
+declare module "bar" {
+    var before: typeof func;
+
+    export default function func(): typeof func;
+
+    var after: typeof func;
+}
+
+//// [es5ExportDefaultFunctionDeclaration4.js]
+
+
+//// [es5ExportDefaultFunctionDeclaration4.d.ts]
+declare module "bar" {
+    var before: typeof func;
+    function func(): typeof func;
+    var after: typeof func;
+}
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
new file mode 100644
index 00000000000..940c095d11f
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.symbols
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts ===
+
+declare module "bar" {
+    var before: typeof func;
+>before : Symbol(before, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 7))
+>func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 28))
+
+    export default function func(): typeof func;
+>func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 28))
+>func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 28))
+
+    var after: typeof func;
+>after : Symbol(after, Decl(es5ExportDefaultFunctionDeclaration4.ts, 6, 7))
+>func : Symbol(func, Decl(es5ExportDefaultFunctionDeclaration4.ts, 2, 28))
+}
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
new file mode 100644
index 00000000000..163311fbd14
--- /dev/null
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
@@ -0,0 +1,15 @@
+=== tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts ===
+
+declare module "bar" {
+    var before: typeof func;
+>before : () => typeof func
+>func : () => typeof func
+
+    export default function func(): typeof func;
+>func : () => typeof func
+>func : () => typeof func
+
+    var after: typeof func;
+>after : () => typeof func
+>func : () => typeof func
+}
diff --git a/tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts b/tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts
new file mode 100644
index 00000000000..4e8acc50e29
--- /dev/null
+++ b/tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts
@@ -0,0 +1,16 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+
+declare module "foo" {
+    export var before: C;
+
+    export default class C {
+        method(): C;
+    }
+
+    export var after: C;
+
+    export var t: typeof C;
+}
+
diff --git a/tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts b/tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts
new file mode 100644
index 00000000000..3d889fa445e
--- /dev/null
+++ b/tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts
@@ -0,0 +1,11 @@
+// @target: es5
+// @module: commonjs
+// @declaration: true
+
+declare module "bar" {
+    var before: typeof func;
+
+    export default function func(): typeof func;
+
+    var after: typeof func;
+}
\ No newline at end of file

From 55af7b36c7993773d78cdf24e9e4b44c2e6b6ba8 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 16 Apr 2015 14:56:22 -0700
Subject: [PATCH 2/6] Fix #2801: Sort module names for AMD preamble

---
 src/compiler/emitter.ts                       | 99 +++++++++++--------
 .../amdDependencyCommentName4.errors.txt      | 35 +++++++
 .../reference/amdDependencyCommentName4.js    | 33 +++++++
 .../es6ImportWithoutFromClauseAmd.js          |  2 +-
 ...athModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...lutePathModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...ePathModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...athModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...tivePathModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...ePathModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...prootUrlModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...otUrlModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...erootUrlModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...otUrlModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...athModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...lutePathModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...ePathModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...athModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...tivePathModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...ePathModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...mapModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...ourcemapModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...cemapModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...UrlModuleMultifolderNoOutdir.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 .../outputdir_module_multifolder/test.js.map  |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt | 17 +---
 ...MultifolderSpecifyOutputFile.sourcemap.txt | 17 +---
 .../amd/test.js.map                           |  2 +-
 ...erootUrlModuleSimpleNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...SimpleSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...oduleSimpleSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 ...otUrlModuleSubfolderNoOutdir.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../amd/outdir/simple/test.js.map             |  2 +-
 ...folderSpecifyOutputDirectory.sourcemap.txt |  9 +-
 ...leSubfolderSpecifyOutputFile.sourcemap.txt |  9 +-
 .../amd/test.js.map                           |  2 +-
 .../compiler/amdDependencyCommentName4.ts     | 21 ++++
 149 files changed, 318 insertions(+), 856 deletions(-)
 create mode 100644 tests/baselines/reference/amdDependencyCommentName4.errors.txt
 create mode 100644 tests/baselines/reference/amdDependencyCommentName4.js
 create mode 100644 tests/cases/compiler/amdDependencyCommentName4.ts

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index ac8c2f828f2..f6f0c9c8446 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4621,19 +4621,6 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 }
             }
 
-            function sortAMDModules(amdModules: {name: string; path: string}[]) {
-                // AMD modules with declared variable names go first
-                return amdModules.sort((moduleA, moduleB) => {
-                    if (moduleA.name === moduleB.name) {
-                        return 0;
-                    } else if (!moduleA.name) {
-                        return 1;
-                    } else {
-                        return -1;
-                    }
-                });
-            }
-
             function emitExportStarHelper() {
                 if (hasExportStars) {
                     writeLine();
@@ -4649,44 +4636,78 @@ var __param = this.__param || function(index, decorator) { return function (targ
 
             function emitAMDModule(node: SourceFile, startIndex: number) {
                 collectExternalModuleInfo(node);
+                
+                /// An AMD define function has the following shape:
+                ///     define(id?, dependencies?, factory);
+                ///
+                /// This has the shape of
+                ///     define(name, ["module1", "module2"], function (module1Alias) {
+                /// The location of the alias in the parameter list in the factory function needs to 
+                /// match the position of the module name in the dependency list.
+                ///
+                /// To ensure this is true in cases of modules with no aliases, e.g.: 
+                /// `import "module"` or `<amd-dependency path= "a.css" \>` we need to add these 
+                /// modules to the end of the dependencies list
+
+                let aliasedModuleNames: string[] = [];
+                let unaliasedModuleNames: string[] = [];
+                let importAliaseNames: string[] = [];
+                for (let importNode of externalImports) {
+                    // Find the name of the external module
+                    let externalModuleName = "";
+                    let moduleName = getExternalModuleName(importNode);
+                    if (moduleName.kind === SyntaxKind.StringLiteral) {
+                        externalModuleName = getLiteralText(<LiteralExpression>moduleName);
+                    }
+
+                    // Find the name of the module alais, if there is one
+                    var importAliasName: string;
+                    let namespaceDeclaration = getNamespaceDeclarationNode(importNode);
+                    if (namespaceDeclaration && !isDefaultImport(importNode)) {
+                        importAliasName = getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
+                    }
+                    else {
+                        importAliasName = getGeneratedNameForNode(<ImportDeclaration | ExportDeclaration>importNode);
+                    }
+
+                    if (importAliasName) {
+                        aliasedModuleNames.push(externalModuleName);
+                        importAliaseNames.push(importAliasName);
+                    }
+                    else {
+                        unaliasedModuleNames.push(externalModuleName);
+                    }
+                }
+
+                // Fill in amd-dependency tags
+                for (let amdDependency of node.amdDependencies) {
+                    if (amdDependency.name) {
+                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        importAliaseNames.push(amdDependency.name);
+                    }
+                    else {
+                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                    }
+                }
+                
                 writeLine();
                 write("define(");
-                sortAMDModules(node.amdDependencies);
                 if (node.amdModuleName) {
                     write("\"" + node.amdModuleName + "\", ");
                 }
                 write("[\"require\", \"exports\"");
-                for (let importNode of externalImports) {
+                if (aliasedModuleNames.length) {
                     write(", ");
-                    let moduleName = getExternalModuleName(importNode);
-                    if (moduleName.kind === SyntaxKind.StringLiteral) {
-                        emitLiteral(<LiteralExpression>moduleName);
-                    }
-                    else {
-                        write("\"\"");
-                    }
+                    write(aliasedModuleNames.join(", "));
                 }
-                for (let amdDependency of node.amdDependencies) {
-                    let text = "\"" + amdDependency.path + "\"";
+                if (unaliasedModuleNames.length) {
                     write(", ");
-                    write(text);
+                    write(unaliasedModuleNames.join(", "));
                 }
                 write("], function (require, exports");
-                for (let importNode of externalImports) {
+                if (importAliaseNames.length) {
                     write(", ");
-                    let namespaceDeclaration = getNamespaceDeclarationNode(importNode);
-                    if (namespaceDeclaration && !isDefaultImport(importNode)) {
-                        emit(namespaceDeclaration.name);
-                    }
-                    else {
-                        write(getGeneratedNameForNode(<ImportDeclaration | ExportDeclaration>importNode));
-                    }
-                }
-                for (let amdDependency of node.amdDependencies) {
-                    if (amdDependency.name) {
-                        write(", ");
-                        write(amdDependency.name);
-                    }
+                    write(importAliaseNames.join(", "));
                 }
                 write(") {");
                 increaseIndent();
diff --git a/tests/baselines/reference/amdDependencyCommentName4.errors.txt b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
new file mode 100644
index 00000000000..6b32830e51c
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName4.errors.txt
@@ -0,0 +1,35 @@
+tests/cases/compiler/amdDependencyCommentName4.ts(8,21): error TS2307: Cannot find external module 'aliasedModule1'.
+tests/cases/compiler/amdDependencyCommentName4.ts(11,26): error TS2307: Cannot find external module 'aliasedModule2'.
+tests/cases/compiler/amdDependencyCommentName4.ts(14,15): error TS2307: Cannot find external module 'aliasedModule3'.
+tests/cases/compiler/amdDependencyCommentName4.ts(17,21): error TS2307: Cannot find external module 'aliasedModule4'.
+
+
+==== tests/cases/compiler/amdDependencyCommentName4.ts (4 errors) ====
+    ///<amd-dependency path='aliasedModule5' name='n1'/>
+    ///<amd-dependency path='unaliasedModule3'/>
+    ///<amd-dependency path='aliasedModule6' name='n2'/>
+    ///<amd-dependency path='unaliasedModule4'/>
+    
+    import "unaliasedModule1";
+    
+    import r1 = require("aliasedModule1");
+                        ~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find external module 'aliasedModule1'.
+    r1;
+    
+    import {p1, p2, p3} from "aliasedModule2";
+                             ~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find external module 'aliasedModule2'.
+    p1;
+    
+    import d from "aliasedModule3";
+                  ~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find external module 'aliasedModule3'.
+    d;
+    
+    import * as ns from "aliasedModule4";
+                        ~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find external module 'aliasedModule4'.
+    ns;
+    
+    import "unaliasedModule2";
\ No newline at end of file
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
new file mode 100644
index 00000000000..04f40140702
--- /dev/null
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -0,0 +1,33 @@
+//// [amdDependencyCommentName4.ts]
+///<amd-dependency path='aliasedModule5' name='n1'/>
+///<amd-dependency path='unaliasedModule3'/>
+///<amd-dependency path='aliasedModule6' name='n2'/>
+///<amd-dependency path='unaliasedModule4'/>
+
+import "unaliasedModule1";
+
+import r1 = require("aliasedModule1");
+r1;
+
+import {p1, p2, p3} from "aliasedModule2";
+p1;
+
+import d from "aliasedModule3";
+d;
+
+import * as ns from "aliasedModule4";
+ns;
+
+import "unaliasedModule2";
+
+//// [amdDependencyCommentName4.js]
+///<amd-dependency path='aliasedModule5' name='n1'/>
+///<amd-dependency path='unaliasedModule3'/>
+///<amd-dependency path='aliasedModule6' name='n2'/>
+///<amd-dependency path='unaliasedModule4'/>
+define(["require", "exports", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "aliasedModule5", "aliasedModule6", "unaliasedModule1", "unaliasedModule2", "unaliasedModule3", "unaliasedModule4"], function (require, exports, r1, aliasedModule2_1, aliasedModule3_1, ns, n1, n2) {
+    r1;
+    aliasedModule2_1.p1;
+    aliasedModule3_1.default;
+    ns;
+});
diff --git a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
index 7b10da7cc9f..b52c94a5c10 100644
--- a/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
+++ b/tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
@@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
     exports.b = 10;
 });
 //// [es6ImportWithoutFromClauseAmd_2.js]
-define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports, , ) {
+define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports) {
     var _a = 10;
     var _b = 10;
 });
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index 021b77c5c7e..4b883a84e70 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index 1ae647dfae6..be0b3a580f5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index a52d154805d..1236cb2c827 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 1ae647dfae6..be0b3a580f5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index d40f871367c..da94013dea3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 1ae647dfae6..be0b3a580f5 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index 93d9d6199b7..834a5c3a112 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/mapRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 2e8f6fe5049..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 357406fe360..ebb800ef3dd 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 2e8f6fe5049..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 7985162b99d..759b9dab302 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/mapRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
index 2e8f6fe5049..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index c9fa657c407..a8488d8a134 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/mapRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 9d8db9a4c71..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 71e537a5f0a..f5cd30a8a50 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 9d8db9a4c71..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 837628ec61f..18b397608e4 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 9d8db9a4c71..80d6bbf450b 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index 9df87b47237..12d96900c84 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/mapRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:../../projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 436695f4e0d..f2b1ea70110 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 7d976d7c896..58dd5dfef82 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:../../projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 436695f4e0d..f2b1ea70110 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index e680f5976dd..c2eacec3bdc 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/mapRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:../../projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 436695f4e0d..f2b1ea70110 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index 559534194af..76375ce0d0c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/mapRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index 3dec08edbfc..5ce16293424 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index a2c4fc8b17e..458c6b06162 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/mapRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 3dec08edbfc..5ce16293424 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 4849040861c..410dc94963f 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/mapRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
index 3dec08edbfc..5ce16293424 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index fd3cc1e9423..46af4847490 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/mapRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index 324bf862942..6139e8293b0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index c206367edaa..59c165fe0e3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 324bf862942..6139e8293b0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 29b0e86baa2..fe747e98d9c 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/mapRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:../outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 324bf862942..6139e8293b0 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
index a065295b528..f07b7d9212d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/maprootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
index b36bc401bb8..4e7e9721b83 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 381bea73055..34cc5d53b87 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index b36bc401bb8..4e7e9721b83 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index c288a90a6ee..1fce6af3084 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:file:///tests/cases/projects/outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
index b36bc401bb8..4e7e9721b83 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
index b36d21d9ba6..7df7c4142e8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/maprootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
index b75b544961a..de9d99184d2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 849fccd6b73..4a730d962af 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b75b544961a..de9d99184d2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index bd126e61877..7c3fae48716 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_simple/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
index b75b544961a..de9d99184d2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_simple/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 6f16ea9e2f1..d2d74c7219d 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/maprootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
index e9f1ee500c9..35691a873b8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 959fdf6baa2..b41fcbbc7b6 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index e9f1ee500c9..35691a873b8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index f9f1988d93d..894bcf6cef4 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:file:///tests/cases/projects/outputdir_module_subfolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
index e9f1ee500c9..35691a873b8 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["file:///tests/cases/projects/outputdir_module_subfolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index d5be2b19f79..e8aa1436d98 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/maprootUrlsourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 9dca948f2f1..009fa65f89c 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 206982bbc7e..deb74d2ae36 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index 0b21c3a7f08..06f3e02521d 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/maprootUrlsourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 16d5644b3d5..0f31c24c539 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index b15912ba2e6..8b526ff5859 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 4582ca1ca5b..89ea048e268 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/maprootUrlsourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 831f0c94f62..c16c32be6b2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index af780a9c2b5..67e50350919 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
index 08265129eac..11b024ba134 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/sourceRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
index c1ff644fb97..aeb0a1c3c5d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index c1ff644fb97..aeb0a1c3c5d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 062c65d4728..0a60d710297 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 4de4e7187f7..e1bca270ba0 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
index c1ff644fb97..aeb0a1c3c5d 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_multifolder/src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
index 66992cb8359..0ff03b640b1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/sourceRootAbsolutePathModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
index 34ab44d4457..945ed0583ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 34ab44d4457..945ed0583ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 3a29347b4ea..52eadf10bdb 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index 5ed1e2a3867..0fc6cd6eb2a 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
index 34ab44d4457..945ed0583ad 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_simple/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
index 247d4dc21da..990b84fd4fd 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/sourceRootAbsolutePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
index 6f9c7463378..f65cfa554d1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6f9c7463378..f65cfa554d1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index ebd955c3327..4491a6dbea5 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index acef32cca00..5e87f2ef555 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 6f9c7463378..f65cfa554d1 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"/tests/cases/projects/outputdir_module_subfolder/src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
index c0fe39d4076..77e69f98790 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/sourceRootRelativePathModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
index 6cbe9eb3387..20138821cfe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 6cbe9eb3387..20138821cfe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 4315a83b043..82da7e4770b 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
index c254e418af5..9c817da60e9 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/sourceRootRelativePathModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 6cbe9eb3387..20138821cfe 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
index 8984f80e86c..b4f6ed8c488 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/sourceRootRelativePathModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
index b6ba5dd0f7e..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index b6ba5dd0f7e..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 01ab16b1f2b..cf74f45b0dc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
index ae7da446d66..c259bb45210 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/sourceRootRelativePathModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
index b6ba5dd0f7e..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
index 6e10b6eea05..a483e0ff9fc 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/sourceRootRelativePathModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
index 43a3eb9d838..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 43a3eb9d838..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 3ba8a06679f..fe64e38c468 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
index 9c2d987c549..7be1fe1fb8f 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/sourceRootRelativePathModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 43a3eb9d838..22f07c17544 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"../src/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
index 55f98059d50..383a66a6e2f 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/sourcemapModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
index 606f3e8ed8a..462fa38ab42 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 74f971bdbdb..181025cda92 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 0decd013acd..7158e15c493 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/sourcemapModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:../../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:../../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
index 39744cb62a8..74ecef44103 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/sourcemapModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 606f3e8ed8a..462fa38ab42 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
index 70b8c90eba8..b461163a8b8 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/sourcemapModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
index 57095af58bb..9bcc170386c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 6afbf97db4d..67882e5327b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index b42d5846da5..c8c025ac582 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/sourcemapModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
index be5429fa802..a1646bc14e5 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/sourcemapModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map
index 57095af58bb..9bcc170386c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
index cbe1d27e1a9..b6ddd879bc1 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/sourcemapModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
index a3cd4c20a53..9bcc170386c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 856699ba7d0..67882e5327b 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index d3470fdb64f..de5d168dad2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/sourcemapModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:../../test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:../../test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
index bcf72481eda..d0abf20190f 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/sourcemapModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map
index a3cd4c20a53..9bcc170386c 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
index 287e688b603..0fa4d7bfa36 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/sourcerootUrlModuleMultifolderNoOutdir.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
index 270469d093c..8a9a8cba430 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/sourcerootUrlModuleMultifolderSpecifyOutputDirectory.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:outdir/simple/outputdir_module_multifolder/test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
index adbd280cf16..86764c6d57a 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/sourcerootUrlModuleMultifolderSpecifyOutputFile.sourcemap.txt
@@ -353,20 +353,6 @@ emittedFile:test.js
 sourceFile:outputdir_module_multifolder/test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1", "../outputdir_module_multifolder_ref/m2"], function (require, exports, m1, m2) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                                                               ^^
-3 >                                                                                                                 ^^
-4 >                                                                                                                   ^^
-1 >import 
-2 >                                                                                                               m1
-3 >                                                                                                                  = require("ref/m1");
-  >                                                                                                                 import 
-4 >                                                                                                                   m2
-1 >Emitted(1, 112) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 114) Source(1, 10) + SourceIndex(0)
-3 >Emitted(1, 116) Source(2, 8) + SourceIndex(0)
-4 >Emitted(1, 118) Source(2, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -374,7 +360,8 @@ sourceFile:outputdir_module_multifolder/test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("../outputdir_module_multifolder_ref/m2");
+1 >import m1 = require("ref/m1");
+  >import m2 = require("../outputdir_module_multifolder_ref/m2");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
index 74fe0bb17da..8612cd0d108 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"+GAAO,EAAE,EACF,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["outputdir_module_multifolder/test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
index ebdcadc16ac..15f5ae4bc93 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/sourcerootUrlModuleSimpleNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
index 51ff0fd9524..6a53c3e9936 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/sourcerootUrlModuleSimpleSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
index a36050cc7e8..3e447368494 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/sourcerootUrlModuleSimpleSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                 ^^
-1 >import 
-2 >                                                                 m1
-1 >Emitted(1, 66) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 68) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("m1");
+1 >import m1 = require("m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
index 9232d211fa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"iEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
index 9bc68f9c969..880d55412f8 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/sourcerootUrlModuleSubfolderNoOutdir.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
index 6d5b4ab1218..fdfa62ec27b 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/sourcerootUrlModuleSubfolderSpecifyOutputDirectory.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:outdir/simple/test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
index b376e70b5af..54c26748c78 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/sourcerootUrlModuleSubfolderSpecifyOutputFile.sourcemap.txt
@@ -181,13 +181,6 @@ emittedFile:test.js
 sourceFile:test.ts
 -------------------------------------------------------------------
 >>>define(["require", "exports", "ref/m1"], function (require, exports, m1) {
-1 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-2 >                                                                     ^^
-1 >import 
-2 >                                                                     m1
-1 >Emitted(1, 70) Source(1, 8) + SourceIndex(0)
-2 >Emitted(1, 72) Source(1, 10) + SourceIndex(0)
----
 >>>    exports.a1 = 10;
 1 >^^^^
 2 >    ^^^^^^^^^^
@@ -195,7 +188,7 @@ sourceFile:test.ts
 4 >                 ^^
 5 >                   ^
 6 >                    ^^^^^^^^->
-1 > = require("ref/m1");
+1 >import m1 = require("ref/m1");
   >export var 
 2 >    a1
 3 >               = 
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
index 870292fffa0..a57b57d2b17 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.js.map
@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"qEAAO,EAAE;IACE,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
+{"version":3,"file":"test.js","sourceRoot":"http://typescript.codeplex.com/","sources":["test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";IACW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
\ No newline at end of file
diff --git a/tests/cases/compiler/amdDependencyCommentName4.ts b/tests/cases/compiler/amdDependencyCommentName4.ts
new file mode 100644
index 00000000000..472044cc919
--- /dev/null
+++ b/tests/cases/compiler/amdDependencyCommentName4.ts
@@ -0,0 +1,21 @@
+//@module: amd
+///<amd-dependency path='aliasedModule5' name='n1'/>
+///<amd-dependency path='unaliasedModule3'/>
+///<amd-dependency path='aliasedModule6' name='n2'/>
+///<amd-dependency path='unaliasedModule4'/>
+
+import "unaliasedModule1";
+
+import r1 = require("aliasedModule1");
+r1;
+
+import {p1, p2, p3} from "aliasedModule2";
+p1;
+
+import d from "aliasedModule3";
+d;
+
+import * as ns from "aliasedModule4";
+ns;
+
+import "unaliasedModule2";
\ No newline at end of file

From d25d55ecc17642c17f45845ca165059dd4377618 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 16 Apr 2015 17:26:06 -0700
Subject: [PATCH 3/6] Respond to code review comments

---
 src/compiler/emitter.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index f6f0c9c8446..2ad3f39195d 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4651,7 +4651,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
 
                 let aliasedModuleNames: string[] = [];
                 let unaliasedModuleNames: string[] = [];
-                let importAliaseNames: string[] = [];
+                let importAliasNames: string[] = [];
                 for (let importNode of externalImports) {
                     // Find the name of the external module
                     let externalModuleName = "";
@@ -4661,7 +4661,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
                     }
 
                     // Find the name of the module alais, if there is one
-                    var importAliasName: string;
+                    let importAliasName: string;
                     let namespaceDeclaration = getNamespaceDeclarationNode(importNode);
                     if (namespaceDeclaration && !isDefaultImport(importNode)) {
                         importAliasName = getSourceTextOfNodeFromSourceFile(currentSourceFile, namespaceDeclaration.name);
@@ -4672,7 +4672,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
 
                     if (importAliasName) {
                         aliasedModuleNames.push(externalModuleName);
-                        importAliaseNames.push(importAliasName);
+                        importAliasNames.push(importAliasName);
                     }
                     else {
                         unaliasedModuleNames.push(externalModuleName);
@@ -4683,7 +4683,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 for (let amdDependency of node.amdDependencies) {
                     if (amdDependency.name) {
                         aliasedModuleNames.push("\"" + amdDependency.path + "\"");
-                        importAliaseNames.push(amdDependency.name);
+                        importAliasNames.push(amdDependency.name);
                     }
                     else {
                         unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
@@ -4705,9 +4705,9 @@ var __param = this.__param || function(index, decorator) { return function (targ
                     write(unaliasedModuleNames.join(", "));
                 }
                 write("], function (require, exports");
-                if (importAliaseNames.length) {
+                if (importAliasNames.length) {
                     write(", ");
-                    write(importAliaseNames.join(", "));
+                    write(importAliasNames.join(", "));
                 }
                 write(") {");
                 increaseIndent();

From a84e64698a56cb647f7c50048a762bc0f3f8421b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 16 Apr 2015 17:32:40 -0700
Subject: [PATCH 4/6] Move amd-dependency erlier in the list

---
 src/compiler/emitter.ts                       | 23 ++++++++++---------
 .../reference/amdDependencyCommentName2.js    |  2 +-
 .../reference/amdDependencyCommentName3.js    |  2 +-
 .../reference/amdDependencyCommentName4.js    |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 2ad3f39195d..9b504e4bed2 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4652,6 +4652,18 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 let aliasedModuleNames: string[] = [];
                 let unaliasedModuleNames: string[] = [];
                 let importAliasNames: string[] = [];
+
+                // Fill in amd-dependency tags
+                for (let amdDependency of node.amdDependencies) {
+                    if (amdDependency.name) {
+                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        importAliasNames.push(amdDependency.name);
+                    }
+                    else {
+                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                    }
+                }
+
                 for (let importNode of externalImports) {
                     // Find the name of the external module
                     let externalModuleName = "";
@@ -4678,17 +4690,6 @@ var __param = this.__param || function(index, decorator) { return function (targ
                         unaliasedModuleNames.push(externalModuleName);
                     }
                 }
-
-                // Fill in amd-dependency tags
-                for (let amdDependency of node.amdDependencies) {
-                    if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
-                        importAliasNames.push(amdDependency.name);
-                    }
-                    else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
-                    }
-                }
                 
                 writeLine();
                 write("define(");
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index 4f54c548580..6f9f1f268e8 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -6,6 +6,6 @@ m1.f();
 
 //// [amdDependencyCommentName2.js]
 ///<amd-dependency path='bar' name='b'/>
-define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) {
+define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index ca6b1280585..2b74dc23aed 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -10,6 +10,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 ///<amd-dependency path='foo'/>
 ///<amd-dependency path='goo' name='c'/>
-define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) {
+define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index 04f40140702..93cdf2399aa 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -25,7 +25,7 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule3'/>
 ///<amd-dependency path='aliasedModule6' name='n2'/>
 ///<amd-dependency path='unaliasedModule4'/>
-define(["require", "exports", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "aliasedModule5", "aliasedModule6", "unaliasedModule1", "unaliasedModule2", "unaliasedModule3", "unaliasedModule4"], function (require, exports, r1, aliasedModule2_1, aliasedModule3_1, ns, n1, n2) {
+define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1.default;

From 6163f5e11d999e51db79800dda69de5745d346e3 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 16 Apr 2015 17:37:01 -0700
Subject: [PATCH 5/6] Add comment

---
 src/compiler/emitter.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 9b504e4bed2..065ad54581b 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4646,12 +4646,16 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 /// match the position of the module name in the dependency list.
                 ///
                 /// To ensure this is true in cases of modules with no aliases, e.g.: 
-                /// `import "module"` or `<amd-dependency path= "a.css" \>` we need to add these 
-                /// modules to the end of the dependencies list
-
-                let aliasedModuleNames: string[] = [];
-                let unaliasedModuleNames: string[] = [];
-                let importAliasNames: string[] = [];
+                /// `import "module"` or `<amd-dependency path= "a.css" \>` we need to add modules
+                /// without alias names to the end of the dependencies list
+                
+                let aliasedModuleNames: string[] = [];   // names of modules with corresponding parameter in the 
+                                                         // factory function.
+                let unaliasedModuleNames: string[] = []; // names of modules with no corresponding parameters in
+                                                         // factory function.
+                let importAliasNames: string[] = [];     // names of the parameters in the factory function, these 
+                                                         // to match the indexes of the corresponding module names
+                                                         // in aliasedModuleNames
 
                 // Fill in amd-dependency tags
                 for (let amdDependency of node.amdDependencies) {

From 3298327ad0890839881f79be8e6c775ce0b95206 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Fri, 17 Apr 2015 10:16:53 -0700
Subject: [PATCH 6/6] update comments

---
 src/compiler/emitter.ts | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 065ad54581b..e031b3c9f5f 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4637,25 +4637,25 @@ var __param = this.__param || function(index, decorator) { return function (targ
             function emitAMDModule(node: SourceFile, startIndex: number) {
                 collectExternalModuleInfo(node);
                 
-                /// An AMD define function has the following shape:
-                ///     define(id?, dependencies?, factory);
-                ///
-                /// This has the shape of
-                ///     define(name, ["module1", "module2"], function (module1Alias) {
-                /// The location of the alias in the parameter list in the factory function needs to 
-                /// match the position of the module name in the dependency list.
-                ///
-                /// To ensure this is true in cases of modules with no aliases, e.g.: 
-                /// `import "module"` or `<amd-dependency path= "a.css" \>` we need to add modules
-                /// without alias names to the end of the dependencies list
+                // An AMD define function has the following shape:
+                //     define(id?, dependencies?, factory);
+                //
+                // This has the shape of
+                //     define(name, ["module1", "module2"], function (module1Alias) {
+                // The location of the alias in the parameter list in the factory function needs to 
+                // match the position of the module name in the dependency list.
+                //
+                // To ensure this is true in cases of modules with no aliases, e.g.: 
+                // `import "module"` or `<amd-dependency path= "a.css" />` 
+                // we need to add modules without alias names to the end of the dependencies list
                 
                 let aliasedModuleNames: string[] = [];   // names of modules with corresponding parameter in the 
                                                          // factory function.
                 let unaliasedModuleNames: string[] = []; // names of modules with no corresponding parameters in
                                                          // factory function.
-                let importAliasNames: string[] = [];     // names of the parameters in the factory function, these 
-                                                         // to match the indexes of the corresponding module names
-                                                         // in aliasedModuleNames
+                let importAliasNames: string[] = [];     // names of the parameters in the factory function; these 
+                                                         // paramters need to match the indexes of the corresponding 
+                                                         // module names in aliasedModuleNames.
 
                 // Fill in amd-dependency tags
                 for (let amdDependency of node.amdDependencies) {