From 2273355df4c4f9d2c75350e6b7dcc5bf31c0604d Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 16 Jul 2014 11:30:14 -0700
Subject: [PATCH 01/13] Start emitting qualified path if the current symbol is
 not visible in enclosing declaration Note that this doesnt handle aliases
 yet.

---
 src/compiler/checker.ts                       |   79 +-
 tests/baselines/reference/commentsModules.js  |    2 +-
 ...tExternalModuleWithSingleExportedModule.js |    2 +-
 .../reference/declFileExportImportChain.js    |    2 +-
 .../reference/declFileExportImportChain2.js   |    2 +-
 .../reference/declFileGenericType.js          |   22 +-
 .../reference/declFileGenericType2.js         |    8 +-
 ...eclFileImportModuleWithExportAssignment.js |   12 +-
 ...eclFileImportedTypeUseInTypeArgPosition.js |    2 +-
 .../reference/declFileInternalAliases.js      |    4 +-
 ...ModuleAssignmentInObjectLiteralProperty.js |    2 +-
 .../reference/declFileModuleContinuation.js   |    2 +-
 .../declFileTypeofInAnonymousType.js          |   10 +-
 ...lictingWithClassReferredByExtendsClause.js |    2 +-
 ...rnalModuleNameConflictsInExtendsClause1.js |    2 +-
 ...rnalModuleNameConflictsInExtendsClause2.js |    2 +-
 ...rnalModuleNameConflictsInExtendsClause3.js |    2 +-
 .../reference/declareFileExportAssignment.js  |    6 +-
 ...tAssignmentWithVarFromVariableStatement.js |    6 +-
 ...entingGenericInterfaceFromAnotherModule.js |    2 +-
 .../reference/genericClassesInModule.js       |    2 +-
 .../baselines/reference/internalAliasClass.js |    2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |    4 +-
 ...liasClassInsideLocalModuleWithoutExport.js |    2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |    2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |    2 +-
 .../baselines/reference/internalAliasEnum.js  |    2 +-
 ...nalAliasEnumInsideLocalModuleWithExport.js |    2 +-
 ...AliasEnumInsideLocalModuleWithoutExport.js |    2 +-
 ...AliasEnumInsideTopLevelModuleWithExport.js |    2 +-
 ...asEnumInsideTopLevelModuleWithoutExport.js |    2 +-
 .../internalAliasInitializedModule.js         |    2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |    2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |    2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |    2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |    2 +-
 .../reference/internalAliasInterface.js       |    2 +-
 ...iasInterfaceInsideLocalModuleWithExport.js |    2 +-
 ...InterfaceInsideLocalModuleWithoutExport.js |    2 +-
 ...InterfaceInsideTopLevelModuleWithExport.js |    2 +-
 ...erfaceInsideTopLevelModuleWithoutExport.js |    2 +-
 .../internalAliasUninitializedModule.js       |    2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |    2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |    2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |    2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |    2 +-
 .../missingImportAfterModuleImport.js         |    2 +-
 .../amd/useModule.d.ts                        |    4 +-
 .../node/useModule.d.ts                       |    4 +-
 .../amd/useModule.d.ts                        |    6 +-
 .../node/useModule.d.ts                       |    6 +-
 .../amd/useModule.d.ts                        |    2 +-
 .../node/useModule.d.ts                       |    2 +-
 .../amd/useModule.d.ts                        |   18 +-
 .../node/useModule.d.ts                       |   18 +-
 .../amd/m5.d.ts                               |    2 +-
 .../amd/useModule.d.ts                        |   14 +-
 .../node/m5.d.ts                              |    2 +-
 .../node/useModule.d.ts                       |   14 +-
 .../amd/useModule.d.ts                        |   12 +-
 .../node/useModule.d.ts                       |   12 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outModuleSimpleNoOutdir/amd/test.d.ts     |    2 +-
 .../outModuleSimpleNoOutdir/node/test.d.ts    |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../outModuleSubfolderNoOutdir/amd/test.d.ts  |    2 +-
 .../outModuleSubfolderNoOutdir/node/test.d.ts |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/m'ain.d.ts                            |    2 +-
 .../node/m'ain.d.ts                           |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../outputdir_module_multifolder/test.d.ts    |    4 +-
 .../amd/test.d.ts                             |    4 +-
 .../node/test.d.ts                            |    4 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 .../amd/outdir/simple/test.d.ts               |    2 +-
 .../node/outdir/simple/test.d.ts              |    2 +-
 .../amd/test.d.ts                             |    2 +-
 .../node/test.d.ts                            |    2 +-
 ...lassDeclarationWhenInBaseTypeResolution.js | 1438 ++++++++---------
 226 files changed, 1138 insertions(+), 1079 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 26c18909603..cdf2c5aa01a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -586,14 +586,74 @@ module ts {
             return (propertySymbol.valueDeclaration.flags & NodeFlags.QuestionMark) && propertySymbol.valueDeclaration.kind !== SyntaxKind.Parameter;
         }
 
-        function symbolToString(symbol: Symbol) {
-            if (symbol.declarations && symbol.declarations.length > 0) {
-                var declaration = symbol.declarations[0];
-                if (declaration.name) {
-                    return identifierToString(declaration.name);
+        function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node) {
+            function containsSymbol(symbols: SymbolTable) {
+                if (hasProperty(symbols, symbol.name)) {
+                    var symbolFromSymbolTable = symbols[symbol.name];
+                    if (symbol === symbolFromSymbolTable) {
+                        return true;
+                    }
+                    // TODO check if symbolFromSymbolTable is alias : and work appropriately if (symbolFromSymbolTable.flags & SymbolFlags.Import)
+                }
+           }
+
+            while (enclosingDeclaration) {
+                // Locals of a source file are not in scope (because they get merged into the global symbol table)
+                if (enclosingDeclaration.locals && (enclosingDeclaration.kind !== SyntaxKind.SourceFile || enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
+                    if (containsSymbol(enclosingDeclaration.locals)) {
+                        return true;
+                    }
+                }
+                switch (enclosingDeclaration.kind) {
+                    case SyntaxKind.SourceFile:
+                        if (!(enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
+                            break;
+                        }
+                    case SyntaxKind.ModuleDeclaration:
+                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).exports)) {
+                            return true;
+                        }
+                        break;
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.InterfaceDeclaration:
+                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).members)) {
+                            return true;
+                        }
+                        break;
+                }
+                enclosingDeclaration = enclosingDeclaration.parent;
+            }
+
+            return containsSymbol(globals);
+        }
+
+        function symbolToString(symbol: Symbol, enclosingDeclaration?: Node) {
+            function getSymbolName(symbol: Symbol) {
+                if (symbol.declarations && symbol.declarations.length > 0) {
+                    var declaration = symbol.declarations[0];
+                    if (declaration.name) {
+                        return identifierToString(declaration.name);
+                    }
+                }
+                return symbol.name;
+            }
+
+            // Get qualified name 
+            var symbolName = getSymbolName(symbol);
+            if (enclosingDeclaration &&
+                !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
+                // TODO if !symbol.parent it could be in globals or it is non exported
+                if (!isSymbolAccessible(symbol, enclosingDeclaration)) {
+                    for (var parent = symbol.parent; parent; parent = parent.parent) {
+                        symbolName = getSymbolName(parent) + "." + symbolName;
+                        if (isSymbolAccessible(parent, enclosingDeclaration)) {
+                            break;
+                        }
+                    }
                 }
             }
-            return symbol.name;
+
+            return symbolName
         }
 
         function createSingleLineTextWriter() {
@@ -615,7 +675,6 @@ module ts {
         }
 
         function writeTypeToTextWriter(type: Type, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter) {
-            // TODO(shkamat): usage of enclosingDeclaration
             var typeStack: Type[];
             return writeType(type, /*allowFunctionOrConstructorTypeLiteral*/ true);
 
@@ -627,7 +686,7 @@ module ts {
                     writeTypeReference(<TypeReference>type);
                 }
                 else if (type.flags & (TypeFlags.Class | TypeFlags.Interface | TypeFlags.Enum | TypeFlags.TypeParameter)) {
-                    writer.write(symbolToString(type.symbol));
+                    writer.write(symbolToString(type.symbol, enclosingDeclaration));
                 }
                 else if (type.flags & TypeFlags.Anonymous) {
                     writeAnonymousType(<ObjectType>type, allowFunctionOrConstructorTypeLiteral);
@@ -649,7 +708,7 @@ module ts {
                     writer.write("[]");
                 }
                 else {
-                    writer.write(symbolToString(type.target.symbol));
+                    writer.write(symbolToString(type.target.symbol, enclosingDeclaration));
                     writer.write("<");
                     for (var i = 0; i < type.typeArguments.length; i++) {
                         if (i > 0) {
@@ -683,7 +742,7 @@ module ts {
 
             function writeTypeofSymbol(type: ObjectType) {
                 writer.write("typeof ");
-                writer.write(symbolToString(type.symbol));
+                writer.write(symbolToString(type.symbol, enclosingDeclaration));
             }
 
             function writeLiteralType(type: ObjectType, allowFunctionOrConstructorTypeLiteral: boolean) {
diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js
index 4d42fa06c41..d59e2d1f235 100644
--- a/tests/baselines/reference/commentsModules.js
+++ b/tests/baselines/reference/commentsModules.js
@@ -254,7 +254,7 @@ declare module m1 {
     function foo2Export(a: string): void;
     function foo3Export(): void;
 }
-declare var myvar: c;
+declare var myvar: m1.m2.c;
 declare module m2.m3 {
     class c {
     }
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index 9e13bf28f6c..60ff82b671a 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -32,4 +32,4 @@ declare module "SubModule" {
 }
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts]
 /// <reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts' />
-export declare var x: c;
+export declare var x: "SubModule".m.m3.c;
diff --git a/tests/baselines/reference/declFileExportImportChain.js b/tests/baselines/reference/declFileExportImportChain.js
index aa0fda1073c..9b921345a1e 100644
--- a/tests/baselines/reference/declFileExportImportChain.js
+++ b/tests/baselines/reference/declFileExportImportChain.js
@@ -74,4 +74,4 @@ export = b;
 //// [declFileExportImportChain_c.d.ts]
 export import b1 = require("declFileExportImportChain_b1");
 //// [declFileExportImportChain_d.d.ts]
-export declare var x: c1;
+export declare var x: m1.m2.c1;
diff --git a/tests/baselines/reference/declFileExportImportChain2.js b/tests/baselines/reference/declFileExportImportChain2.js
index 52b470dae2a..3b2e1936c39 100644
--- a/tests/baselines/reference/declFileExportImportChain2.js
+++ b/tests/baselines/reference/declFileExportImportChain2.js
@@ -65,4 +65,4 @@ export = a;
 //// [declFileExportImportChain2_c.d.ts]
 export import b = require("declFileExportImportChain2_b");
 //// [declFileExportImportChain2_d.d.ts]
-export declare var x: c1;
+export declare var x: m1.m2.c1;
diff --git a/tests/baselines/reference/declFileGenericType.js b/tests/baselines/reference/declFileGenericType.js
index 95c5e77a2bb..2be231c1381 100644
--- a/tests/baselines/reference/declFileGenericType.js
+++ b/tests/baselines/reference/declFileGenericType.js
@@ -130,16 +130,16 @@ export declare module C {
         constructor(val: T);
     }
 }
-export declare var a: A<B>;
-export declare var b: <T>(x: T) => A<B>;
-export declare var c: <T>(x: T) => A<B>;
-export declare var d: <T>(x: T) => A<B>[];
-export declare var e: <T extends A<B>>(x: T) => A<B>[];
-export declare var x: A<B>;
-export declare function f<T extends A<B>>(): void;
-export declare var g: A<B>;
-export declare class h extends A<B> {
+export declare var a: C.A<C.B>;
+export declare var b: <T>(x: T) => C.A<C.B>;
+export declare var c: <T>(x: T) => C.A<C.B>;
+export declare var d: <T>(x: T) => C.A<C.B>[];
+export declare var e: <T extends C.A<C.B>>(x: T) => C.A<C.B>[];
+export declare var x: C.A<C.B>;
+export declare function f<T extends C.A<C.B>>(): void;
+export declare var g: C.A<C.B>;
+export declare class h extends C.A<C.B> {
 }
-export interface i extends A<B> {
+export interface i extends C.A<C.B> {
 }
-export declare var j: <T extends A<B>>(x: T) => T;
+export declare var j: <T extends C.A<C.B>>(x: T) => T;
diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
index 6ecfbcfadf2..ef8ee547913 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -99,17 +99,17 @@ declare module templa.mvc {
 declare module templa.mvc.composite {
 }
 declare module templa.dom.mvc {
-    interface IElementController<ModelType extends IModel> extends IController<ModelType> {
+    interface IElementController<ModelType extends mvc.IModel> extends mvc.IController<ModelType> {
     }
 }
 declare module templa.dom.mvc {
-    class AbstractElementController<ModelType extends IModel> extends AbstractController<ModelType> implments IElementController<ModelType> {
+    class AbstractElementController<ModelType extends mvc.IModel> extends mvc.AbstractController<ModelType> implments IElementController<ModelType> {
         constructor();
     }
 }
 declare module templa.dom.mvc.composite {
-    class AbstractCompositeElementController<ModelType extends ICompositeControllerModel> extends AbstractElementController<ModelType> {
-        _controllers: IController<IModel>[];
+    class AbstractCompositeElementController<ModelType extends mvc.composite.ICompositeControllerModel> extends AbstractElementController<ModelType> {
+        _controllers: mvc.IController<mvc.IModel>[];
         constructor();
     }
 }
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index d6144cc944f..75d8d3e5840 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -46,14 +46,14 @@ declare module m2 {
     }
 }
 declare var m2: {
-    (): connectExport;
-    test1: connectModule;
-    test2(): connectModule;
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
 };
 export = m2;
 //// [declFileImportModuleWithExportAssignment_1.d.ts]
 export declare var a: {
-    (): connectExport;
-    test1: connectModule;
-    test2(): connectModule;
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
 };
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
index de6e91d110d..cd7f462a5ee 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
@@ -27,5 +27,5 @@ declare class List<T> {
 declare module 'mod1' {
 }
 declare module 'moo' {
-    var p: List<Foo>;
+    var p: List<'mod1'.Foo>;
 }
diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js
index c7afbbc4303..f41a2e7db6a 100644
--- a/tests/baselines/reference/declFileInternalAliases.js
+++ b/tests/baselines/reference/declFileInternalAliases.js
@@ -40,9 +40,9 @@ declare module m {
     }
 }
 declare module m1 {
-    var d: c;
+    var d: m.c;
 }
 declare module m2 {
     export import x = m.c;
-    var d: c;
+    var d: m.c;
 }
diff --git a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
index f3756b3c88b..1b361e9e048 100644
--- a/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
+++ b/tests/baselines/reference/declFileModuleAssignmentInObjectLiteralProperty.js
@@ -35,6 +35,6 @@ declare var d: {
         m: typeof m1;
     };
     m2: {
-        c: typeof c;
+        c: typeof m1.c;
     };
 };
diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js
index de667cbad26..88acd267fbf 100644
--- a/tests/baselines/reference/declFileModuleContinuation.js
+++ b/tests/baselines/reference/declFileModuleContinuation.js
@@ -33,6 +33,6 @@ declare module A.C {
     }
 }
 declare module A.B.C {
-    class W implments Z {
+    class W implments C.Z {
     }
 }
diff --git a/tests/baselines/reference/declFileTypeofInAnonymousType.js b/tests/baselines/reference/declFileTypeofInAnonymousType.js
index b9fbc999988..2210f189d16 100644
--- a/tests/baselines/reference/declFileTypeofInAnonymousType.js
+++ b/tests/baselines/reference/declFileTypeofInAnonymousType.js
@@ -63,10 +63,10 @@ declare module m1 {
     }
 }
 declare var a: {
-    c: c;
+    c: m1.c;
 };
 declare var b: {
-    c: typeof c;
+    c: typeof m1.c;
     m1: typeof m1;
 };
 declare var c: {
@@ -77,10 +77,10 @@ declare var d: {
         mod: typeof m1;
     };
     mc: {
-        cl: typeof c;
+        cl: typeof m1.c;
     };
     me: {
-        en: typeof e;
+        en: typeof m1.e;
     };
-    mh: e;
+    mh: m1.e;
 };
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
index 9566e027b13..72895c41a8f 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -73,7 +73,7 @@ declare module A.B.Base {
     }
 }
 declare module X.Y.base {
-    class W extends W {
+    class W extends A.B.Base.W {
         name: string;
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
index 62ab7cb52a7..dd3f70dd5d1 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
@@ -38,6 +38,6 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments Z {
+    class W implments C.Z {
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
index 0badfa40d75..786a8f897bc 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
@@ -41,7 +41,7 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments Z {
+    class W implments C.Z {
     }
 }
 declare module X.A.B.C {
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
index 113a9207005..3cd54743c50 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
@@ -41,7 +41,7 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments Z {
+    class W implments C.Z {
     }
 }
 declare module X.A.B.C {
diff --git a/tests/baselines/reference/declareFileExportAssignment.js b/tests/baselines/reference/declareFileExportAssignment.js
index 3f05e984139..ff16eee27fc 100644
--- a/tests/baselines/reference/declareFileExportAssignment.js
+++ b/tests/baselines/reference/declareFileExportAssignment.js
@@ -34,8 +34,8 @@ declare module m2 {
     }
 }
 declare var m2: {
-    (): connectExport;
-    test1: connectModule;
-    test2(): connectModule;
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
 };
 export = m2;
diff --git a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
index 35216d0ea18..c4acd795453 100644
--- a/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
+++ b/tests/baselines/reference/declareFileExportAssignmentWithVarFromVariableStatement.js
@@ -34,8 +34,8 @@ declare module m2 {
     }
 }
 declare var m2: {
-    (): connectExport;
-    test1: connectModule;
-    test2(): connectModule;
+    (): m2.connectExport;
+    test1: m2.connectModule;
+    test2(): m2.connectModule;
 };
 export = m2;
diff --git a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
index 216bf318ff9..bbfc13f872b 100644
--- a/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
+++ b/tests/baselines/reference/genericClassImplementingGenericInterfaceFromAnotherModule.js
@@ -25,6 +25,6 @@ declare module foo {
     }
 }
 declare module bar {
-    class Foo<T> implments IFoo<T> {
+    class Foo<T> implments foo.IFoo<T> {
     }
 }
diff --git a/tests/baselines/reference/genericClassesInModule.js b/tests/baselines/reference/genericClassesInModule.js
index c5d142fba04..3f19b1f71f7 100644
--- a/tests/baselines/reference/genericClassesInModule.js
+++ b/tests/baselines/reference/genericClassesInModule.js
@@ -35,4 +35,4 @@ declare module Foo {
     class A {
     }
 }
-declare var a: B<A>;
+declare var a: Foo.B<Foo.A>;
diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js
index 21c51867f9b..4d1958d9e69 100644
--- a/tests/baselines/reference/internalAliasClass.js
+++ b/tests/baselines/reference/internalAliasClass.js
@@ -32,5 +32,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: c;
+    var x: a.c;
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index c9f02ad9bba..d48b5cf1979 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -51,7 +51,7 @@ export declare module x {
 export declare module m2 {
     module m3 {
         export import c = x.c;
-        var cProp: c;
+        var cProp: x.c;
     }
 }
-export declare var d: c;
+export declare var d: x.c;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 795ff99e0cc..8043f68d5f5 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -47,6 +47,6 @@ export declare module x {
 }
 export declare module m2 {
     module m3 {
-        var cProp: c;
+        var cProp: x.c;
     }
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index c540d590578..cd27e8e71e7 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -36,4 +36,4 @@ export declare module x {
     }
 }
 export import xc = x.c;
-export declare var cProp: c;
+export declare var cProp: x.c;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index 362220210d6..e21579a25bf 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module x {
         foo(a: number): number;
     }
 }
-export declare var cProp: c;
+export declare var cProp: x.c;
diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js
index 195d4afd2d9..aab43af8aa6 100644
--- a/tests/baselines/reference/internalAliasEnum.js
+++ b/tests/baselines/reference/internalAliasEnum.js
@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var bVal: weekend;
+    var bVal: a.weekend;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index e13f3031d09..514273bc610 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -40,5 +40,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.weekend;
-    var bVal: weekend;
+    var bVal: a.weekend;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index dad264ff60a..44355c86536 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var bVal: weekend;
+    var bVal: a.weekend;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index 25659ea0e9f..91ab770cfc4 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -36,4 +36,4 @@ export declare module a {
     }
 }
 export import b = a.weekend;
-export declare var bVal: weekend;
+export declare var bVal: a.weekend;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 05848f91183..21b53cd3c8a 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module a {
         Sunday = 2,
     }
 }
-export declare var bVal: weekend;
+export declare var bVal: a.weekend;
diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js
index ed8a729dbd2..cb6d1d9e84a 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.js
+++ b/tests/baselines/reference/internalAliasInitializedModule.js
@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: c;
+    var x: a.b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index cebed340aec..463e25fb1c0 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -42,5 +42,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.b;
-    var x: c;
+    var x: a.b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index 85630fd13c7..ece1caf7300 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: c;
+    var x: a.b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 86bc3297ad6..2c840ebe4ea 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -34,4 +34,4 @@ export declare module a {
     }
 }
 export import b = a.b;
-export declare var x: c;
+export declare var x: a.b.c;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 742e01d0bf2..843a653ae3a 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module a {
         }
     }
 }
-export declare var x: c;
+export declare var x: a.b.c;
diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js
index 2a1cdd4a33e..911f8c78175 100644
--- a/tests/baselines/reference/internalAliasInterface.js
+++ b/tests/baselines/reference/internalAliasInterface.js
@@ -23,5 +23,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: I;
+    var x: a.I;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index 9c9f6a2da9e..b039ac30bdb 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -26,5 +26,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.I;
-    var x: I;
+    var x: a.I;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index f28a2170637..3ce012660eb 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -25,5 +25,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: I;
+    var x: a.I;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
index e7e06d2fa3f..2b3b2108383 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
@@ -18,4 +18,4 @@ export declare module a {
     }
 }
 export import b = a.I;
-export declare var x: I;
+export declare var x: a.I;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
index 96b524afb10..b029e4e31b6 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
@@ -19,4 +19,4 @@ export declare module a {
     interface I {
     }
 }
-export declare var x: I;
+export declare var x: a.I;
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js
index b436adaadde..1b361802a1b 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.js
+++ b/tests/baselines/reference/internalAliasUninitializedModule.js
@@ -30,5 +30,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: I;
+    var x: a.b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index c4348fde070..8ad67cdca5c 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -31,5 +31,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.b;
-    var x: I;
+    var x: a.b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index e51dcc9c2f9..f8d5fc51aae 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -30,5 +30,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: I;
+    var x: a.b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index d61e607911d..0aec8a86917 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -28,4 +28,4 @@ export declare module a {
     }
 }
 export import b = a.b;
-export declare var x: I;
+export declare var x: a.b.I;
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index 87968329c3b..b586b557792 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -25,4 +25,4 @@ export declare module a {
         }
     }
 }
-export declare var x: I;
+export declare var x: a.b.I;
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js
index 1ab1376589c..70fb5372f87 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.js
+++ b/tests/baselines/reference/missingImportAfterModuleImport.js
@@ -45,7 +45,7 @@ declare module "SubModule" {
 //// [missingImportAfterModuleImport_1.d.ts]
 /// <reference path='missingImportAfterModuleImport_0.d.ts' />
 declare class MainModule {
-    SubModule: SubModule;
+    SubModule: "SubModule".SubModule;
     constructor();
 }
 export = MainModule;
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
index 675eb48a51d..5b6d77769cb 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
@@ -1,8 +1,8 @@
 declare module "quotedm1" {
     class v {
-        c: d;
+        c: "m4".d;
     }
 }
 declare module "quotedm2" {
-    var c: v;
+    var c: "quotedm1".v;
 }
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
index 675eb48a51d..5b6d77769cb 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
@@ -1,8 +1,8 @@
 declare module "quotedm1" {
     class v {
-        c: d;
+        c: "m4".d;
     }
 }
 declare module "quotedm2" {
-    var c: v;
+    var c: "quotedm1".v;
 }
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
index 225cc823cb3..9cdf2c9b10a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
@@ -1,3 +1,3 @@
-export declare var useGlo_m4_x4: d;
-export declare var useGlo_m4_d4: typeof d;
-export declare var useGlo_m4_f4: d;
+export declare var useGlo_m4_x4: "glo_m4".d;
+export declare var useGlo_m4_d4: typeof "glo_m4".d;
+export declare var useGlo_m4_f4: "glo_m4".d;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
index 225cc823cb3..9cdf2c9b10a 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
@@ -1,3 +1,3 @@
-export declare var useGlo_m4_x4: d;
-export declare var useGlo_m4_d4: typeof d;
-export declare var useGlo_m4_f4: d;
+export declare var useGlo_m4_x4: "glo_m4".d;
+export declare var useGlo_m4_d4: typeof "glo_m4".d;
+export declare var useGlo_m4_f4: "glo_m4".d;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
index b05c7d95224..bb065c3f1db 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
@@ -1 +1 @@
-export declare var useFncOnly_m4_f4: d;
+export declare var useFncOnly_m4_f4: "fncOnly_m4".d;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
index b05c7d95224..bb065c3f1db 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
@@ -1 +1 @@
-export declare var useFncOnly_m4_f4: d;
+export declare var useFncOnly_m4_f4: "fncOnly_m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
index 919ea95f7de..a81996fb0e0 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
@@ -1,11 +1,11 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
-export declare var useMultiImport_m4_x4: d;
-export declare var useMultiImport_m4_d4: typeof d;
-export declare var useMultiImport_m4_f4: d;
+export declare var useMultiImport_m4_x4: "m4".d;
+export declare var useMultiImport_m4_d4: typeof "m4".d;
+export declare var useMultiImport_m4_f4: "m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
index 919ea95f7de..a81996fb0e0 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
@@ -1,11 +1,11 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
-export declare var useMultiImport_m4_x4: d;
-export declare var useMultiImport_m4_d4: typeof d;
-export declare var useMultiImport_m4_f4: d;
+export declare var useMultiImport_m4_x4: "m4".d;
+export declare var useMultiImport_m4_d4: typeof "m4".d;
+export declare var useMultiImport_m4_f4: "m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
index fe04ba82f46..a05e54a4522 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
@@ -1 +1 @@
-export declare function foo2(): d;
+export declare function foo2(): "m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
index 65160982a26..2f1f3af3259 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
@@ -1,9 +1,9 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
-export declare var d: d;
+export declare var d: "m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
index fe04ba82f46..a05e54a4522 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
@@ -1 +1 @@
-export declare function foo2(): d;
+export declare function foo2(): "m4".d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
index 65160982a26..2f1f3af3259 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
@@ -1,9 +1,9 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
-export declare var d: d;
+export declare var d: "m4".d;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
index 6408152fa5b..920ed75e453 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
@@ -1,8 +1,8 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
index 6408152fa5b..920ed75e453 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
@@ -1,8 +1,8 @@
-export declare var x4: d;
-export declare var d4: typeof d;
-export declare var f4: d;
+export declare var x4: "m4".d;
+export declare var d4: typeof "m4".d;
+export declare var f4: "m4".d;
 export declare module m1 {
-    var x2: d;
-    var d2: typeof d;
-    var f2: d;
+    var x2: "m4".d;
+    var d2: typeof "m4".d;
+    var f2: "m4".d;
 }
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
index 99ff5fcf070..cdde109b62b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/amd/m'ain.d.ts
@@ -1,3 +1,3 @@
 /// <reference path='li'b/class'A.d.ts' />
-declare class ClassC extends ClassA {
+declare class ClassC extends test.ClassA {
 }
diff --git a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
index 99ff5fcf070..cdde109b62b 100644
--- a/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
+++ b/tests/baselines/reference/project/quotesInFileAndDirectoryNames/node/m'ain.d.ts
@@ -1,3 +1,3 @@
 /// <reference path='li'b/class'A.d.ts' />
-declare class ClassC extends ClassA {
+declare class ClassC extends test.ClassA {
 }
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 5886fb1a02e..3192c54b9a3 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
-export declare var a3: typeof m2_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..8ea5ed86ea2 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index 1b358c0f26a..d3670632f16 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof m1_c1;
+export declare var a2: typeof "ref/m1".m1_c1;
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
index 482e30360fe..b514fb088e9 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.js
@@ -7407,474 +7407,474 @@ var caurinus;
 
 //// [resolvingClassDeclarationWhenInBaseTypeResolution.d.ts]
 declare module rionegrensis {
-    class caniventer extends nitidus<minutilla, sumatrana> {
+    class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
         salomonseni(): caniventer;
-        uchidai(): xanthognathus;
-        raffrayana(): otion;
-        Uranium(): inez<inez<stolzmanni, melanops>, falconeri>;
-        nayaur(): amicus;
+        uchidai(): lavali.xanthognathus;
+        raffrayana(): lavali.otion;
+        Uranium(): minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>;
+        nayaur(): gabriellae.amicus;
     }
-    class veraecrucis<T0, T1> extends mixtus<amicus, punicus> {
-        naso(): setulosus<punicus, coludo<bobrinskoi, melanoleuca>>;
-        vancouverensis(): ciliolabrum<oreas, peninsulae>;
-        africana(): gilbertii<linulus<lepturus, oreas>, cinereus<xanthognathus, oreas>>;
-        palliolata(): jugularis;
-        nivicola(): pallidus;
+    class veraecrucis<T0, T1> extends trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> {
+        naso(): panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>;
+        vancouverensis(): imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>;
+        africana(): argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>;
+        palliolata(): Lanthanum.jugularis;
+        nivicola(): samarensis.pallidus;
     }
 }
 declare module julianae {
     class steerii {
     }
     class nudicaudus {
-        brandtii(): germaini;
-        maxwellii(): Praseodymium<jugularis, melanops>;
-        endoi(): abidi<kaiseri, wilsoni>;
-        venezuelae(): marcanoi;
-        zamicrus(): caniventer;
+        brandtii(): argurus.germaini;
+        maxwellii(): ruatanica.Praseodymium<Lanthanum.jugularis, dammermani.melanops>;
+        endoi(): panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>;
+        venezuelae(): howi.marcanoi;
+        zamicrus(): rionegrensis.caniventer;
     }
     class galapagoensis {
-        isabellae(): amphibius<daphaenodon, uralensis>;
-        rueppellii(): americanus;
-        peregusna(): kaiseri;
-        gliroides(): coludo<marcanoi, wilsoni>;
-        banakrisi(): daphaenodon;
-        rozendaali(): foina;
-        stuhlmanni(): linulus<megaphyllus, megaphyllus>;
+        isabellae(): panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>;
+        rueppellii(): ruatanica.americanus;
+        peregusna(): dogramacii.kaiseri;
+        gliroides(): howi.coludo<howi.marcanoi, lavali.wilsoni>;
+        banakrisi(): macrorhinos.daphaenodon;
+        rozendaali(): lutreolus.foina;
+        stuhlmanni(): panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>;
     }
     class albidens<T0, T1> {
-        mattheyi(): fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>;
+        mattheyi(): samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>;
         Astatine(): steerii;
-        vincenti(): dauricus<konganensis, uralensis>;
-        hirta(): jugularis;
+        vincenti(): argurus.dauricus<macrorhinos.konganensis, patas.uralensis>;
+        hirta(): Lanthanum.jugularis;
         virginianus(): durangae;
-        macrophyllum(): marcanoi;
-        porcellus(): americanus;
+        macrophyllum(): howi.marcanoi;
+        porcellus(): ruatanica.americanus;
     }
-    class oralis<T0, T1> extends psilurus {
-        cepapi(): psilurus;
-        porteri(): thaeleri;
-        bindi(): mahaganus<amicus, amphibius<daphaenodon, uralensis>>;
-        puda(): stolzmanni;
-        mindorensis(): falconeri;
-        ignitus(): rosalia<setulosus<echinatus, steerii>, wilsoni>;
+    class oralis<T0, T1> extends caurinus.psilurus {
+        cepapi(): caurinus.psilurus;
+        porteri(): lavali.thaeleri;
+        bindi(): caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>;
+        puda(): sagitta.stolzmanni;
+        mindorensis(): trivirgatus.falconeri;
+        ignitus(): petrophilus.rosalia<panamensis.setulosus<gabriellae.echinatus, steerii>, lavali.wilsoni>;
         rufus(): nudicaudus;
-        monax(): subspinosus;
-        unalascensis(): inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>;
-        wuchihensis(): angulatus<coludo<carolinensis, portoricensis>, minutilla>;
-        leucippe(): otion;
-        ordii(): arboreus<germaini, stolzmanni>;
-        eisentrauti(): zuluensis;
+        monax(): imperfecta.subspinosus;
+        unalascensis(): minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>;
+        wuchihensis(): howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>;
+        leucippe(): lavali.otion;
+        ordii(): daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>;
+        eisentrauti(): rendalli.zuluensis;
     }
-    class sumatrana extends jugularis {
-        wolffsohni(): suillus<melanops, carolinensis>;
-        geata(): hector<sumatrana, bobrinskoi>;
-        awashensis(): minutilla;
-        sturdeei(): cor<jugularis, galapagoensis>;
-        pachyurus(): angulatus<aurata, gerbillus<thaeleri, carolinensis>>;
-        lyelli(): melanoleuca;
-        neohibernicus(): siberu<foina, pallidus>;
+    class sumatrana extends Lanthanum.jugularis {
+        wolffsohni(): Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>;
+        geata(): ruatanica.hector<sumatrana, quasiater.bobrinskoi>;
+        awashensis(): petrophilus.minutilla;
+        sturdeei(): lutreolus.cor<Lanthanum.jugularis, galapagoensis>;
+        pachyurus(): howi.angulatus<dogramacii.aurata, gerbillus<lavali.thaeleri, quasiater.carolinensis>>;
+        lyelli(): provocax.melanoleuca;
+        neohibernicus(): dammermani.siberu<lutreolus.foina, samarensis.pallidus>;
     }
     class gerbillus<T0, T1> {
-        pundti(): sicarius<koepckeae, psilurus>;
-        tristrami(): minutilla;
-        swarthi(): foina;
-        horsfieldii(): falconeri;
-        diazi(): lasiurus<foina, melanops>;
-        rennelli(): luctuosa;
-        maulinus(): lepturus;
-        muscina(): arboreus<minutilla, peninsulae>;
-        pelengensis(): leptoceros<psilurus, echinatus>;
-        abramus(): thaeleri;
-        reevesi(): melanoleuca;
+        pundti(): sagitta.sicarius<dogramacii.koepckeae, caurinus.psilurus>;
+        tristrami(): petrophilus.minutilla;
+        swarthi(): lutreolus.foina;
+        horsfieldii(): trivirgatus.falconeri;
+        diazi(): imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>;
+        rennelli(): argurus.luctuosa;
+        maulinus(): lavali.lepturus;
+        muscina(): daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>;
+        pelengensis(): sagitta.leptoceros<caurinus.psilurus, gabriellae.echinatus>;
+        abramus(): lavali.thaeleri;
+        reevesi(): provocax.melanoleuca;
     }
     class acariensis {
-        levicula(): lepturus;
-        minous(): dauricus<carolinensis, otion>;
-        cinereiventer(): setulosus<walkeri, otion>;
-        longicaudatus(): marmosurus<melanops, mahaganus<nudicaudus, otion>>;
-        baeodon(): netscheri<siberu<foina, pallidus>, luctuosa>;
-        soricoides(): luctuosa;
-        datae(): arboreus<melanoleuca, amphibius<daphaenodon, uralensis>>;
-        spixii(): subspinosus;
-        anakuma(): wilsoni;
-        kihaulei(): amphibius<oconnelli, konganensis>;
-        gymnura(): carolinensis;
-        olchonensis(): crenulata<falconeri, melanoleuca>;
+        levicula(): lavali.lepturus;
+        minous(): argurus.dauricus<quasiater.carolinensis, lavali.otion>;
+        cinereiventer(): panamensis.setulosus<sagitta.walkeri, lavali.otion>;
+        longicaudatus(): macrorhinos.marmosurus<dammermani.melanops, caurinus.mahaganus<nudicaudus, lavali.otion>>;
+        baeodon(): argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>;
+        soricoides(): argurus.luctuosa;
+        datae(): daubentonii.arboreus<provocax.melanoleuca, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>;
+        spixii(): imperfecta.subspinosus;
+        anakuma(): lavali.wilsoni;
+        kihaulei(): panglima.amphibius<trivirgatus.oconnelli, macrorhinos.konganensis>;
+        gymnura(): quasiater.carolinensis;
+        olchonensis(): rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>;
     }
-    class durangae extends aurata {
-        Californium(): setulosus<punicus, melanops>;
-        Flerovium(): angulatus<minutilla, xanthognathus>;
-        phrudus(): stolzmanni;
+    class durangae extends dogramacii.aurata {
+        Californium(): panamensis.setulosus<lutreolus.punicus, dammermani.melanops>;
+        Flerovium(): howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>;
+        phrudus(): sagitta.stolzmanni;
     }
 }
 declare module ruatanica {
     class hector<T0, T1> {
-        humulis(): steerii;
-        eurycerus(): linulus<Praseodymium<jugularis, melanops>, wilsoni>;
+        humulis(): julianae.steerii;
+        eurycerus(): panamensis.linulus<Praseodymium<Lanthanum.jugularis, dammermani.melanops>, lavali.wilsoni>;
     }
 }
 declare module Lanthanum {
     class suillus<T0, T1> {
-        spilosoma(): carolinensis;
-        tumbalensis(): megaphyllus;
-        anatolicus(): steerii;
+        spilosoma(): quasiater.carolinensis;
+        tumbalensis(): caurinus.megaphyllus;
+        anatolicus(): julianae.steerii;
     }
-    class nitidus<T0, T1> extends gilbertii<thaeleri, punicus> {
-        granatensis(): bobrinskoi;
-        negligens(): inez<wilsoni, wilsoni>;
-        lewisi(): oralis<xanthognathus, oreas>;
-        arge(): sarasinorum<megaphyllus, xanthognathus>;
-        dominicensis(): melanops;
-        taurus(): konganensis;
-        tonganus(): netscheri<aurata, aurata>;
-        silvatica(): moojeni<aurata, otion>;
-        midas(): xanthognathus;
-        bicornis(): kaiseri;
+    class nitidus<T0, T1> extends argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> {
+        granatensis(): quasiater.bobrinskoi;
+        negligens(): minutus.inez<lavali.wilsoni, lavali.wilsoni>;
+        lewisi(): julianae.oralis<lavali.xanthognathus, argurus.oreas>;
+        arge(): chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>;
+        dominicensis(): dammermani.melanops;
+        taurus(): macrorhinos.konganensis;
+        tonganus(): argurus.netscheri<dogramacii.aurata, dogramacii.aurata>;
+        silvatica(): rendalli.moojeni<dogramacii.aurata, lavali.otion>;
+        midas(): lavali.xanthognathus;
+        bicornis(): dogramacii.kaiseri;
     }
-    class megalonyx extends johorensis<megaphyllus, steerii> {
-        phillipsii(): konganensis;
-        melanogaster(): veraecrucis<falconeri, carolinensis>;
-        elaphus(): nitidus<minutilla, sumatrana>;
-        elater(): lepturus;
-        ourebi(): melanoleuca;
-        caraccioli(): ciliolabrum<nudicaudus, Praseodymium<thaeleri, acariensis>>;
-        parva(): echinatus;
-        albipes(): wattsi<melanops, megalonyx>;
+    class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
+        phillipsii(): macrorhinos.konganensis;
+        melanogaster(): rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>;
+        elaphus(): nitidus<petrophilus.minutilla, julianae.sumatrana>;
+        elater(): lavali.lepturus;
+        ourebi(): provocax.melanoleuca;
+        caraccioli(): imperfecta.ciliolabrum<julianae.nudicaudus, ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>>;
+        parva(): gabriellae.echinatus;
+        albipes(): quasiater.wattsi<dammermani.melanops, megalonyx>;
     }
     class jugularis {
-        torrei(): sodyi<oreas, daphaenodon>;
-        revoili(): wilsoni;
-        macrobullatus(): daphaenodon;
-        compactus(): stolzmanni;
-        talpinus(): nitidus<americanus, stolzmanni>;
-        stramineus(): amicus;
-        dartmouthi(): mixtus<daphaenodon, luctuosa>;
-        ogilbyi(): dauricus<oreas, carolinensis>;
-        incomtus(): nesiotes<sumatrana, carolinensis>;
-        surdaster(): Praseodymium<germaini, megaphyllus>;
-        melanorhinus(): pelurus<melanops, zuluensis>;
-        picticaudata(): inez<wattsi<carolinensis, lepturus>, kaiseri>;
-        pomona(): steerii;
-        ileile(): carolinensis;
+        torrei(): petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>;
+        revoili(): lavali.wilsoni;
+        macrobullatus(): macrorhinos.daphaenodon;
+        compactus(): sagitta.stolzmanni;
+        talpinus(): nitidus<ruatanica.americanus, sagitta.stolzmanni>;
+        stramineus(): gabriellae.amicus;
+        dartmouthi(): trivirgatus.mixtus<macrorhinos.daphaenodon, argurus.luctuosa>;
+        ogilbyi(): argurus.dauricus<argurus.oreas, quasiater.carolinensis>;
+        incomtus(): daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>;
+        surdaster(): ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>;
+        melanorhinus(): samarensis.pelurus<dammermani.melanops, rendalli.zuluensis>;
+        picticaudata(): minutus.inez<quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>, dogramacii.kaiseri>;
+        pomona(): julianae.steerii;
+        ileile(): quasiater.carolinensis;
     }
 }
 declare module rendalli {
-    class zuluensis extends steerii {
-        telfairi(): wetmorei<megalonyx, melanoleuca>;
-        keyensis(): wattsi<carolinensis, lepturus>;
-        occasius(): gilbertii<psilurus, xanthognathus>;
-        damarensis(): galapagoensis;
-        Neptunium(): abidi<robustulus, foina>;
-        griseoflavus(): americanus;
-        thar(): oreas;
-        alborufus(): linulus<lepturus, oreas>;
-        fusicaudus(): stolzmanni;
-        gordonorum(): angulatus<americanus, germaini>;
-        ruber(): siberu<punicus, acariensis>;
-        desmarestianus(): steerii;
-        lutillus(): dolichurus<marcanoi, wilsoni>;
-        salocco(): peninsulae;
+    class zuluensis extends julianae.steerii {
+        telfairi(): argurus.wetmorei<Lanthanum.megalonyx, provocax.melanoleuca>;
+        keyensis(): quasiater.wattsi<quasiater.carolinensis, lavali.lepturus>;
+        occasius(): argurus.gilbertii<caurinus.psilurus, lavali.xanthognathus>;
+        damarensis(): julianae.galapagoensis;
+        Neptunium(): panglima.abidi<dogramacii.robustulus, lutreolus.foina>;
+        griseoflavus(): ruatanica.americanus;
+        thar(): argurus.oreas;
+        alborufus(): panamensis.linulus<lavali.lepturus, argurus.oreas>;
+        fusicaudus(): sagitta.stolzmanni;
+        gordonorum(): howi.angulatus<ruatanica.americanus, argurus.germaini>;
+        ruber(): dammermani.siberu<lutreolus.punicus, julianae.acariensis>;
+        desmarestianus(): julianae.steerii;
+        lutillus(): nigra.dolichurus<howi.marcanoi, lavali.wilsoni>;
+        salocco(): argurus.peninsulae;
     }
     class moojeni<T0, T1> {
-        floweri(): otion;
-        montosa(): ciliolabrum<megalonyx, minutilla>;
-        miletus(): sumatrana;
+        floweri(): lavali.otion;
+        montosa(): imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>;
+        miletus(): julianae.sumatrana;
         heaneyi(): zuluensis;
-        marchei(): amphibius<uralensis, klossii<nudicaudus, aurata>>;
-        budini(): durangae;
-        maggietaylorae(): mixtus<amphibius<klossii<jugularis, jugularis>, subspinosus>, stolzmanni>;
-        poliocephalus(): gerbillus<durangae, melanops>;
-        zibethicus(): inez<stolzmanni, melanops>;
-        biacensis(): coludo<bobrinskoi, melanoleuca>;
+        marchei(): panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>;
+        budini(): julianae.durangae;
+        maggietaylorae(): trivirgatus.mixtus<panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>, sagitta.stolzmanni>;
+        poliocephalus(): julianae.gerbillus<julianae.durangae, dammermani.melanops>;
+        zibethicus(): minutus.inez<sagitta.stolzmanni, dammermani.melanops>;
+        biacensis(): howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>;
     }
-    class crenulata<T0, T1> extends falconeri {
-        salvanius(): coludo<marcanoi, caniventer>;
-        maritimus(): americanus;
-        edax(): cor<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, caniventer>;
+    class crenulata<T0, T1> extends trivirgatus.falconeri {
+        salvanius(): howi.coludo<howi.marcanoi, rionegrensis.caniventer>;
+        maritimus(): ruatanica.americanus;
+        edax(): lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>;
     }
 }
 declare module trivirgatus {
     class tumidifrons<T0, T1> {
-        nivalis(): kaiseri;
-        vestitus(): xanthognathus;
-        aequatorius(): caniventer;
+        nivalis(): dogramacii.kaiseri;
+        vestitus(): lavali.xanthognathus;
+        aequatorius(): rionegrensis.caniventer;
         scherman(): oconnelli;
-        improvisum(): peninsulae;
-        cervinipes(): abidi<lepturus, psilurus>;
-        audax(): robustulus;
-        vallinus(): sicarius<wilsoni, punicus>;
+        improvisum(): argurus.peninsulae;
+        cervinipes(): panglima.abidi<lavali.lepturus, caurinus.psilurus>;
+        audax(): dogramacii.robustulus;
+        vallinus(): sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>;
     }
-    class mixtus<T0, T1> extends pygmaea<oreas, fundatus<carolinensis, daphaenodon>> {
-        ochrogaster(): aurata;
-        bryophilus(): marmosurus<koepckeae, abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>>;
-        liechtensteini(): zuluensis;
-        crawfordi(): coludo<steerii, gerbillus<thaeleri, carolinensis>>;
-        hypsibia(): thaeleri;
-        matacus(): fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops>;
-        demidoff(): johorensis<acariensis, zuluensis>;
+    class mixtus<T0, T1> extends argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> {
+        ochrogaster(): dogramacii.aurata;
+        bryophilus(): macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>;
+        liechtensteini(): rendalli.zuluensis;
+        crawfordi(): howi.coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>;
+        hypsibia(): lavali.thaeleri;
+        matacus(): panglima.fundatus<panamensis.linulus<lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops>;
+        demidoff(): caurinus.johorensis<julianae.acariensis, rendalli.zuluensis>;
     }
     class lotor<T0, T1> {
-        balensis(): pallidus;
-        pullata(): veraecrucis<carolinensis, peninsulae>;
+        balensis(): samarensis.pallidus;
+        pullata(): rionegrensis.veraecrucis<quasiater.carolinensis, argurus.peninsulae>;
     }
     class falconeri {
-        cabrali(): moojeni<lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>, arboreus<nudicaudus, steerii>>;
-        gouldi(): dolichurus<lasiurus<acariensis, coludo<oreas, marcanoi>>, uralensis>;
-        fuscicollis(): pelurus<melanops, nitidus<americanus, stolzmanni>>;
-        martiensseni(): cinereus<ciliolabrum<otion, sodyi<konganensis, psilurus>>, koepckeae>;
-        gaoligongensis(): koepckeae;
-        shawi(): inez<stolzmanni, veraecrucis<xanthognathus, bobrinskoi>>;
-        gmelini(): caniventer;
+        cabrali(): rendalli.moojeni<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>>;
+        gouldi(): nigra.dolichurus<imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>, patas.uralensis>;
+        fuscicollis(): samarensis.pelurus<dammermani.melanops, Lanthanum.nitidus<ruatanica.americanus, sagitta.stolzmanni>>;
+        martiensseni(): sagitta.cinereus<imperfecta.ciliolabrum<lavali.otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>, dogramacii.koepckeae>;
+        gaoligongensis(): dogramacii.koepckeae;
+        shawi(): minutus.inez<sagitta.stolzmanni, rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>>;
+        gmelini(): rionegrensis.caniventer;
     }
     class oconnelli {
-        youngsoni(): thalia<uralensis, galapagoensis>;
-        terrestris(): konganensis;
-        chrysopus(): sicarius<koepckeae, sodyi<oreas, daphaenodon>>;
-        fuscomurina(): peninsulae;
-        hellwaldii(): gracilis<setulosus<walkeri, robustulus>, sodyi<oreas, daphaenodon>>;
-        aenea(): luctuosa;
-        perrini(): bobrinskoi;
-        entellus(): melanops;
-        krebsii(): veraecrucis<caniventer, durangae>;
-        cephalotes(): schlegeli;
-        molossinus(): nigricans<carolinensis, nesiotes<sumatrana, carolinensis>>;
-        luisi(): robustulus;
-        ceylonicus(): caniventer;
-        ralli(): xanthognathus;
+        youngsoni(): nigra.thalia<patas.uralensis, julianae.galapagoensis>;
+        terrestris(): macrorhinos.konganensis;
+        chrysopus(): sagitta.sicarius<dogramacii.koepckeae, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>;
+        fuscomurina(): argurus.peninsulae;
+        hellwaldii(): nigra.gracilis<panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>, petrophilus.sodyi<argurus.oreas, macrorhinos.daphaenodon>>;
+        aenea(): argurus.luctuosa;
+        perrini(): quasiater.bobrinskoi;
+        entellus(): dammermani.melanops;
+        krebsii(): rionegrensis.veraecrucis<rionegrensis.caniventer, julianae.durangae>;
+        cephalotes(): lutreolus.schlegeli;
+        molossinus(): daubentonii.nigricans<quasiater.carolinensis, daubentonii.nesiotes<julianae.sumatrana, quasiater.carolinensis>>;
+        luisi(): dogramacii.robustulus;
+        ceylonicus(): rionegrensis.caniventer;
+        ralli(): lavali.xanthognathus;
     }
 }
 declare module quasiater {
     class bobrinskoi {
-        crassicaudatus(): cahirinus<daphaenodon, luctuosa>;
-        mulatta(): oreas;
-        ansorgei(): moojeni<amphibius<falconeri, psilurus>, echinatus>;
-        Copper(): netscheri<carolinensis, kaiseri>;
+        crassicaudatus(): samarensis.cahirinus<macrorhinos.daphaenodon, argurus.luctuosa>;
+        mulatta(): argurus.oreas;
+        ansorgei(): rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>;
+        Copper(): argurus.netscheri<carolinensis, dogramacii.kaiseri>;
     }
 }
 declare module ruatanica {
-    class americanus extends ciliolabrum<germaini, foina> {
-        nasoloi(): konganensis;
-        mystacalis(): angulatus<carolinensis, stolzmanni>;
-        fardoulisi(): oconnelli;
-        tumidus(): amicus;
+    class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
+        nasoloi(): macrorhinos.konganensis;
+        mystacalis(): howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>;
+        fardoulisi(): trivirgatus.oconnelli;
+        tumidus(): gabriellae.amicus;
     }
 }
 declare module lavali {
-    class wilsoni extends nitidus<caniventer, jugularis> {
-        setiger(): thalia<uralensis, wilsoni>;
-        lorentzii(): subspinosus;
-        antisensis(): foina;
-        blossevillii(): siberu<megalonyx, kaiseri>;
-        bontanus(): caniventer;
-        caligata(): oreas;
-        franqueti(): amphibius<klossii<jugularis, jugularis>, subspinosus>;
-        roberti(): acariensis;
-        degelidus(): sarasinorum<jugularis, subspinosus>;
-        amoenus(): carolinensis;
-        kob(): lotor<oreas, beisa>;
-        csorbai(): johorensis<megaphyllus, steerii>;
-        dorsata(): echinatus;
+    class wilsoni extends Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis> {
+        setiger(): nigra.thalia<patas.uralensis, wilsoni>;
+        lorentzii(): imperfecta.subspinosus;
+        antisensis(): lutreolus.foina;
+        blossevillii(): dammermani.siberu<Lanthanum.megalonyx, dogramacii.kaiseri>;
+        bontanus(): rionegrensis.caniventer;
+        caligata(): argurus.oreas;
+        franqueti(): panglima.amphibius<gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>, imperfecta.subspinosus>;
+        roberti(): julianae.acariensis;
+        degelidus(): chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>;
+        amoenus(): quasiater.carolinensis;
+        kob(): trivirgatus.lotor<argurus.oreas, beisa>;
+        csorbai(): caurinus.johorensis<caurinus.megaphyllus, julianae.steerii>;
+        dorsata(): gabriellae.echinatus;
     }
     class beisa {
     }
-    class otion extends coludo<oreas, marcanoi> {
-        bonaerensis(): melanoleuca;
-        dussumieri(): gracilis<steerii, kaiseri>;
-        osvaldoreigi(): albidens<steerii, carolinensis>;
-        grevyi(): pallidus;
+    class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
+        bonaerensis(): provocax.melanoleuca;
+        dussumieri(): nigra.gracilis<julianae.steerii, dogramacii.kaiseri>;
+        osvaldoreigi(): julianae.albidens<julianae.steerii, quasiater.carolinensis>;
+        grevyi(): samarensis.pallidus;
         hirtula(): lepturus;
-        cristatus(): luctuosa;
-        darlingtoni(): leptoceros<wilsoni, oconnelli>;
-        fontanierii(): setulosus<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, foina>;
-        umbrosus(): marcanoi;
-        chiriquinus(): lasiurus<psilurus, psilurus>;
-        orarius(): schlegeli;
-        ilaeus(): mahaganus<acariensis, sumatrana>;
-        musschenbroekii(): falconeri;
+        cristatus(): argurus.luctuosa;
+        darlingtoni(): sagitta.leptoceros<wilsoni, trivirgatus.oconnelli>;
+        fontanierii(): panamensis.setulosus<samarensis.fuscus<wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, lutreolus.foina>;
+        umbrosus(): howi.marcanoi;
+        chiriquinus(): imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus>;
+        orarius(): lutreolus.schlegeli;
+        ilaeus(): caurinus.mahaganus<julianae.acariensis, julianae.sumatrana>;
+        musschenbroekii(): trivirgatus.falconeri;
     }
     class xanthognathus {
-        nanulus(): nigricans<subspinosus, pallidus>;
-        albigena(): sarasinorum<psilurus, bobrinskoi>;
-        onca(): stolzmanni;
-        gunnii(): himalayana<coludo<lepturus, punicus>, thalia<uralensis, robustulus>>;
-        apeco(): foina;
-        variegates(): klossii<wilsoni, nudicaudus>;
-        goudotii(): falconeri;
-        pohlei(): megalonyx;
-        ineptus(): setulosus<xanthognathus, beisa>;
-        euryotis(): moojeni<steerii, pelurus<jugularis, americanus>>;
-        maurisca(): suillus<caniventer, subspinosus>;
-        coyhaiquensis(): mahaganus<siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>, punicus>;
+        nanulus(): daubentonii.nigricans<imperfecta.subspinosus, samarensis.pallidus>;
+        albigena(): chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>;
+        onca(): sagitta.stolzmanni;
+        gunnii(): minutus.himalayana<howi.coludo<lepturus, lutreolus.punicus>, nigra.thalia<patas.uralensis, dogramacii.robustulus>>;
+        apeco(): lutreolus.foina;
+        variegates(): gabriellae.klossii<wilsoni, julianae.nudicaudus>;
+        goudotii(): trivirgatus.falconeri;
+        pohlei(): Lanthanum.megalonyx;
+        ineptus(): panamensis.setulosus<xanthognathus, beisa>;
+        euryotis(): rendalli.moojeni<julianae.steerii, samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>>;
+        maurisca(): Lanthanum.suillus<rionegrensis.caniventer, imperfecta.subspinosus>;
+        coyhaiquensis(): caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>;
     }
-    class thaeleri extends oreas {
-        coromandra(): galapagoensis;
-        parvipes(): dolichurus<germaini, pallidus>;
-        sponsorius(): veraecrucis<sarasinorum<psilurus, bobrinskoi>, steerii>;
-        vates(): robustulus;
-        roosmalenorum(): koepckeae;
-        rubicola(): moojeni<caniventer, moojeni<amphibius<falconeri, psilurus>, echinatus>>;
-        ikonnikovi(): luctuosa;
-        paramicrus(): ciliolabrum<otion, sodyi<konganensis, psilurus>>;
+    class thaeleri extends argurus.oreas {
+        coromandra(): julianae.galapagoensis;
+        parvipes(): nigra.dolichurus<argurus.germaini, samarensis.pallidus>;
+        sponsorius(): rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>;
+        vates(): dogramacii.robustulus;
+        roosmalenorum(): dogramacii.koepckeae;
+        rubicola(): rendalli.moojeni<rionegrensis.caniventer, rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>>;
+        ikonnikovi(): argurus.luctuosa;
+        paramicrus(): imperfecta.ciliolabrum<otion, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>;
     }
-    class lepturus extends suillus<melanops, carolinensis> {
-        ferrumequinum(): netscheri<luctuosa, nudicaudus>;
-        aequalis(): cinereus<sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>, jugularis>;
+    class lepturus extends Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> {
+        ferrumequinum(): argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>;
+        aequalis(): sagitta.cinereus<petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>, Lanthanum.jugularis>;
     }
 }
 declare module dogramacii {
-    class robustulus extends wilsoni {
-        fossor(): inez<peninsulae, nudicaudus>;
-        humboldti(): cinereus<xanthognathus, oreas>;
-        mexicana(): konganensis;
-        martini(): oralis<steerii, lepturus>;
-        beatus(): jugularis;
-        leporina(): falconeri;
-        pearsonii(): melanops;
-        keaysi(): angulatus<beisa, zuluensis>;
-        hindei(): lasiurus<konganensis, steerii>;
+    class robustulus extends lavali.wilsoni {
+        fossor(): minutus.inez<argurus.peninsulae, julianae.nudicaudus>;
+        humboldti(): sagitta.cinereus<lavali.xanthognathus, argurus.oreas>;
+        mexicana(): macrorhinos.konganensis;
+        martini(): julianae.oralis<julianae.steerii, lavali.lepturus>;
+        beatus(): Lanthanum.jugularis;
+        leporina(): trivirgatus.falconeri;
+        pearsonii(): dammermani.melanops;
+        keaysi(): howi.angulatus<lavali.beisa, rendalli.zuluensis>;
+        hindei(): imperfecta.lasiurus<macrorhinos.konganensis, julianae.steerii>;
     }
     class koepckeae {
-        culturatus(): pelurus<arboreus<kaiseri, punicus>, sumatrana>;
+        culturatus(): samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>;
     }
     class kaiseri {
-        bedfordiae(): carolinensis;
-        paramorum(): megalonyx;
-        rubidus(): lotor<steerii, pallidus>;
-        juninensis(): bobrinskoi;
-        marginata(): wetmorei<caniventer, leptoceros<punicus, arboreus<carolinensis, caniventer>>>;
-        Meitnerium(): Praseodymium<sumatrana, cor<jugularis, galapagoensis>>;
-        pinetorum(): caniventer;
-        hoolock(): pelurus<oreas, luctuosa>;
-        poeyi(): echinatus;
-        Thulium(): durangae;
-        patrius(): jugularis;
-        quadraticauda(): nudicaudus;
-        ater(): americanus;
+        bedfordiae(): quasiater.carolinensis;
+        paramorum(): Lanthanum.megalonyx;
+        rubidus(): trivirgatus.lotor<julianae.steerii, samarensis.pallidus>;
+        juninensis(): quasiater.bobrinskoi;
+        marginata(): argurus.wetmorei<rionegrensis.caniventer, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>;
+        Meitnerium(): ruatanica.Praseodymium<julianae.sumatrana, lutreolus.cor<Lanthanum.jugularis, julianae.galapagoensis>>;
+        pinetorum(): rionegrensis.caniventer;
+        hoolock(): samarensis.pelurus<argurus.oreas, argurus.luctuosa>;
+        poeyi(): gabriellae.echinatus;
+        Thulium(): julianae.durangae;
+        patrius(): Lanthanum.jugularis;
+        quadraticauda(): julianae.nudicaudus;
+        ater(): ruatanica.americanus;
     }
     class aurata {
-        grunniens(): gracilis<pelurus<arboreus<kaiseri, punicus>, sumatrana>, americanus>;
-        howensis(): americanus;
-        karlkoopmani(): psilurus;
-        mirapitanga(): albidens<echinatus, echinatus>;
+        grunniens(): nigra.gracilis<samarensis.pelurus<daubentonii.arboreus<kaiseri, lutreolus.punicus>, julianae.sumatrana>, ruatanica.americanus>;
+        howensis(): ruatanica.americanus;
+        karlkoopmani(): caurinus.psilurus;
+        mirapitanga(): julianae.albidens<gabriellae.echinatus, gabriellae.echinatus>;
         ophiodon(): aurata;
-        landeri(): pelurus<jugularis, americanus>;
-        sonomae(): lotor<abidi<lepturus, psilurus>, koepckeae>;
-        erythromos(): johorensis<fundatus<pallidus, stolzmanni>, dolichurus<lepturus, pallidus>>;
+        landeri(): samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>;
+        sonomae(): trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, koepckeae>;
+        erythromos(): caurinus.johorensis<panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>;
     }
 }
 declare module lutreolus {
-    class schlegeli extends beisa {
-        mittendorfi(): caniventer;
-        blicki(): robustulus;
-        culionensis(): dauricus<americanus, caniventer>;
-        scrofa(): sodyi<amicus, sumatrana>;
-        fernandoni(): carolinensis;
-        Tin(): leptoceros<punicus, arboreus<carolinensis, caniventer>>;
-        marmorata(): setulosus<carolinensis, arboreus<kaiseri, punicus>>;
-        tavaratra(): nitidus<marcanoi, daphaenodon>;
-        peregrina(): nesiotes<konganensis, punicus>;
-        frontalis(): marmosurus<hector<sumatrana, pelurus<jugularis, walkeri>>, pallidus>;
-        cuniculus(): uralensis;
-        magdalenae(): gerbillus<caniventer, crenulata<zuluensis, robustulus>>;
-        andamanensis(): oralis<americanus, zuluensis>;
-        dispar(): linulus<kaiseri, portoricensis>;
+    class schlegeli extends lavali.beisa {
+        mittendorfi(): rionegrensis.caniventer;
+        blicki(): dogramacii.robustulus;
+        culionensis(): argurus.dauricus<ruatanica.americanus, rionegrensis.caniventer>;
+        scrofa(): petrophilus.sodyi<gabriellae.amicus, julianae.sumatrana>;
+        fernandoni(): quasiater.carolinensis;
+        Tin(): sagitta.leptoceros<punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>;
+        marmorata(): panamensis.setulosus<quasiater.carolinensis, daubentonii.arboreus<dogramacii.kaiseri, punicus>>;
+        tavaratra(): Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>;
+        peregrina(): daubentonii.nesiotes<macrorhinos.konganensis, punicus>;
+        frontalis(): macrorhinos.marmosurus<ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>, samarensis.pallidus>;
+        cuniculus(): patas.uralensis;
+        magdalenae(): julianae.gerbillus<rionegrensis.caniventer, rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>>;
+        andamanensis(): julianae.oralis<ruatanica.americanus, rendalli.zuluensis>;
+        dispar(): panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>;
     }
 }
 declare module argurus {
     class dauricus<T0, T1> {
-        chinensis(): jugularis;
-        duodecimcostatus(): xanthognathus;
-        foxi(): nesiotes<beisa, lepturus>;
-        macleayii(): sodyi<wattsi<galapagoensis, linulus<xanthognathus, konganensis>>, minutilla>;
-        darienensis(): oconnelli;
-        hardwickii(): daphaenodon;
-        albifrons(): veraecrucis<lepturus, durangae>;
-        jacobitus(): johorensis<konganensis, johorensis<peninsulae, arboreus<germaini, stolzmanni>>>;
-        guentheri(): moojeni<foina, oreas>;
-        mahomet(): ciliolabrum<germaini, foina>;
-        misionensis(): marmosurus<arboreus<carolinensis, caniventer>, echinatus>;
+        chinensis(): Lanthanum.jugularis;
+        duodecimcostatus(): lavali.xanthognathus;
+        foxi(): daubentonii.nesiotes<lavali.beisa, lavali.lepturus>;
+        macleayii(): petrophilus.sodyi<quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>, petrophilus.minutilla>;
+        darienensis(): trivirgatus.oconnelli;
+        hardwickii(): macrorhinos.daphaenodon;
+        albifrons(): rionegrensis.veraecrucis<lavali.lepturus, julianae.durangae>;
+        jacobitus(): caurinus.johorensis<macrorhinos.konganensis, caurinus.johorensis<peninsulae, daubentonii.arboreus<germaini, sagitta.stolzmanni>>>;
+        guentheri(): rendalli.moojeni<lutreolus.foina, oreas>;
+        mahomet(): imperfecta.ciliolabrum<germaini, lutreolus.foina>;
+        misionensis(): macrorhinos.marmosurus<daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>, gabriellae.echinatus>;
     }
 }
 declare module nigra {
     class dolichurus<T0, T1> {
-        solomonis(): abidi<carolinensis, crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>>;
-        alfredi(): psilurus;
-        morrisi(): hector<oconnelli, cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>>;
-        lekaguli(): nitidus<melanops, lepturus>;
-        dimissus(): subspinosus;
-        phaeotis(): sumatrana;
-        ustus(): acariensis;
-        sagei(): marcanoi;
+        solomonis(): panglima.abidi<quasiater.carolinensis, rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>>;
+        alfredi(): caurinus.psilurus;
+        morrisi(): ruatanica.hector<trivirgatus.oconnelli, sagitta.cinereus<caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>>;
+        lekaguli(): Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>;
+        dimissus(): imperfecta.subspinosus;
+        phaeotis(): julianae.sumatrana;
+        ustus(): julianae.acariensis;
+        sagei(): howi.marcanoi;
     }
 }
 declare module panglima {
-    class amphibius<T0, T1> extends johorensis<nitidus<minutilla, sumatrana>, jugularis> {
-        bottegi(): marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>;
-        jerdoni(): daphaenodon;
-        camtschatica(): pallidus;
-        spadix(): sodyi<konganensis, psilurus>;
-        luismanueli(): moojeni<sumatrana, oconnelli>;
-        aceramarcae(): arboreus<nudicaudus, steerii>;
+    class amphibius<T0, T1> extends caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> {
+        bottegi(): macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>;
+        jerdoni(): macrorhinos.daphaenodon;
+        camtschatica(): samarensis.pallidus;
+        spadix(): petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>;
+        luismanueli(): rendalli.moojeni<julianae.sumatrana, trivirgatus.oconnelli>;
+        aceramarcae(): daubentonii.arboreus<julianae.nudicaudus, julianae.steerii>;
     }
-    class fundatus<T0, T1> extends schlegeli {
-        crassulus(): gracilis<melanoleuca, melanoleuca>;
-        flamarioni(): lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>;
-        mirabilis(): marmosurus<rosalia<steerii, beisa>, lepturus>;
+    class fundatus<T0, T1> extends lutreolus.schlegeli {
+        crassulus(): nigra.gracilis<provocax.melanoleuca, provocax.melanoleuca>;
+        flamarioni(): imperfecta.lasiurus<amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>;
+        mirabilis(): macrorhinos.marmosurus<petrophilus.rosalia<julianae.steerii, lavali.beisa>, lavali.lepturus>;
     }
-    class abidi<T0, T1> extends dauricus<germaini, durangae> {
-        greyii(): oconnelli;
-        macedonicus(): minutilla;
-        galili(): cahirinus<melanops, pallidus>;
-        thierryi(): robustulus;
-        ega(): lasiurus<acariensis, coludo<oreas, marcanoi>>;
+    class abidi<T0, T1> extends argurus.dauricus<argurus.germaini, julianae.durangae> {
+        greyii(): trivirgatus.oconnelli;
+        macedonicus(): petrophilus.minutilla;
+        galili(): samarensis.cahirinus<dammermani.melanops, samarensis.pallidus>;
+        thierryi(): dogramacii.robustulus;
+        ega(): imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>>;
     }
 }
 declare module quasiater {
     class carolinensis {
-        concinna(): zuluensis;
-        aeneus(): marcanoi;
-        aloysiisabaudiae(): netscheri<lotor<oreas, beisa>, lepturus>;
-        tenellus(): nudicaudus;
-        andium(): beisa;
-        persephone(): fundatus<pallidus, stolzmanni>;
-        patrizii(): megalonyx;
+        concinna(): rendalli.zuluensis;
+        aeneus(): howi.marcanoi;
+        aloysiisabaudiae(): argurus.netscheri<trivirgatus.lotor<argurus.oreas, lavali.beisa>, lavali.lepturus>;
+        tenellus(): julianae.nudicaudus;
+        andium(): lavali.beisa;
+        persephone(): panglima.fundatus<samarensis.pallidus, sagitta.stolzmanni>;
+        patrizii(): Lanthanum.megalonyx;
     }
 }
 declare module minutus {
-    class himalayana<T0, T1> extends punicus {
-        simoni(): netscheri<lepturus, dauricus<oreas, carolinensis>>;
-        lobata(): pallidus;
-        rusticus(): aurata;
-        latona(): nesiotes<melanops, megalonyx>;
-        famulus(): uralensis;
-        flaviceps(): inez<oreas, fundatus<amicus, foina>>;
-        paradoxolophus(): dolichurus<schlegeli, sarasinorum<jugularis, subspinosus>>;
-        Osmium(): wilsoni;
-        vulgaris(): nitidus<lepturus, acariensis>;
-        betsileoensis(): amphibius<megaphyllus, lepturus>;
-        vespuccii(): gilbertii<klossii<konganensis, carolinensis>, melanoleuca>;
-        olympus(): megalonyx;
+    class himalayana<T0, T1> extends lutreolus.punicus {
+        simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>;
+        lobata(): samarensis.pallidus;
+        rusticus(): dogramacii.aurata;
+        latona(): daubentonii.nesiotes<dammermani.melanops, Lanthanum.megalonyx>;
+        famulus(): patas.uralensis;
+        flaviceps(): inez<argurus.oreas, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>;
+        paradoxolophus(): nigra.dolichurus<lutreolus.schlegeli, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>;
+        Osmium(): lavali.wilsoni;
+        vulgaris(): Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>;
+        betsileoensis(): panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>;
+        vespuccii(): argurus.gilbertii<gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>, provocax.melanoleuca>;
+        olympus(): Lanthanum.megalonyx;
     }
 }
 declare module caurinus {
-    class mahaganus<T0, T1> extends fundatus<carolinensis, daphaenodon> {
-        martiniquensis(): hector<sumatrana, marmosurus<melanops, mahaganus<nudicaudus, otion>>>;
-        devius(): pelurus<aurata, inez<inez<stolzmanni, melanops>, falconeri>>;
-        masalai(): oreas;
-        kathleenae(): dolichurus<uralensis, psilurus>;
-        simulus(): echinatus;
-        nigrovittatus(): mahaganus<echinatus, rosalia<megalonyx, abidi<kaiseri, wilsoni>>>;
-        senegalensis(): klossii<coludo<lepturus, punicus>, melanops>;
-        acticola(): luctuosa;
+    class mahaganus<T0, T1> extends panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon> {
+        martiniquensis(): ruatanica.hector<julianae.sumatrana, macrorhinos.marmosurus<dammermani.melanops, mahaganus<julianae.nudicaudus, lavali.otion>>>;
+        devius(): samarensis.pelurus<dogramacii.aurata, minutus.inez<minutus.inez<sagitta.stolzmanni, dammermani.melanops>, trivirgatus.falconeri>>;
+        masalai(): argurus.oreas;
+        kathleenae(): nigra.dolichurus<patas.uralensis, psilurus>;
+        simulus(): gabriellae.echinatus;
+        nigrovittatus(): mahaganus<gabriellae.echinatus, petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>>;
+        senegalensis(): gabriellae.klossii<howi.coludo<lavali.lepturus, lutreolus.punicus>, dammermani.melanops>;
+        acticola(): argurus.luctuosa;
     }
 }
 declare module macrorhinos {
     class marmosurus<T0, T1> {
-        tansaniana(): punicus;
+        tansaniana(): lutreolus.punicus;
     }
 }
 declare module howi {
-    class angulatus<T0, T1> extends stolzmanni {
+    class angulatus<T0, T1> extends sagitta.stolzmanni {
         pennatus(): marcanoi;
     }
 }
@@ -7884,118 +7884,118 @@ declare module daubentonii {
 }
 declare module nigra {
     class thalia<T0, T1> {
-        dichotomus(): carolinensis;
-        arnuxii(): linulus<lotor<luctuosa, wilsoni>, beisa>;
-        verheyeni(): xanthognathus;
-        dauuricus(): amicus;
-        tristriatus(): veraecrucis<marcanoi, linulus<megalonyx, marcanoi>>;
-        lasiura(): abidi<fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>, nitidus<lepturus, acariensis>>;
-        gangetica(): luctuosa;
-        brucei(): sarasinorum<steerii, americanus>;
+        dichotomus(): quasiater.carolinensis;
+        arnuxii(): panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>;
+        verheyeni(): lavali.xanthognathus;
+        dauuricus(): gabriellae.amicus;
+        tristriatus(): rionegrensis.veraecrucis<howi.marcanoi, panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>>;
+        lasiura(): panglima.abidi<samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>, Lanthanum.nitidus<lavali.lepturus, julianae.acariensis>>;
+        gangetica(): argurus.luctuosa;
+        brucei(): chrysaeolus.sarasinorum<julianae.steerii, ruatanica.americanus>;
     }
 }
 declare module sagitta {
-    class walkeri extends portoricensis {
-        maracajuensis(): cahirinus<jugularis, americanus>;
+    class walkeri extends minutus.portoricensis {
+        maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>;
     }
 }
 declare module minutus {
-    class inez<T0, T1> extends pelurus<germaini, durangae> {
-        vexillaris(): cahirinus<lepturus, wilsoni>;
+    class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
+        vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>;
     }
 }
 declare module macrorhinos {
-    class konganensis extends lasiurus<psilurus, psilurus> {
+    class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
     }
 }
 declare module panamensis {
-    class linulus<T0, T1> extends hector<sumatrana, pelurus<jugularis, walkeri>> {
-        goslingi(): arboreus<amicus, kaiseri>;
-        taki(): uralensis;
-        fumosus(): moojeni<netscheri<aurata, aurata>, beisa>;
-        rufinus(): konganensis;
-        lami(): thalia<uralensis, robustulus>;
-        regina(): oconnelli;
-        nanilla(): siberu<xanthognathus, oconnelli>;
-        enganus(): sodyi<aurata, oreas>;
-        gomantongensis(): veraecrucis<psilurus, inez<zuluensis, caniventer>>;
+    class linulus<T0, T1> extends ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>> {
+        goslingi(): daubentonii.arboreus<gabriellae.amicus, dogramacii.kaiseri>;
+        taki(): patas.uralensis;
+        fumosus(): rendalli.moojeni<argurus.netscheri<dogramacii.aurata, dogramacii.aurata>, lavali.beisa>;
+        rufinus(): macrorhinos.konganensis;
+        lami(): nigra.thalia<patas.uralensis, dogramacii.robustulus>;
+        regina(): trivirgatus.oconnelli;
+        nanilla(): dammermani.siberu<lavali.xanthognathus, trivirgatus.oconnelli>;
+        enganus(): petrophilus.sodyi<dogramacii.aurata, argurus.oreas>;
+        gomantongensis(): rionegrensis.veraecrucis<caurinus.psilurus, minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>>;
     }
 }
 declare module nigra {
     class gracilis<T0, T1> {
-        weddellii(): dolichurus<aurata, steerii>;
-        echinothrix(): nitidus<amphibius<megaphyllus, lepturus>, oreas>;
-        garridoi(): koepckeae;
-        rouxii(): gracilis<dauricus<konganensis, uralensis>, thalia<uralensis, galapagoensis>>;
-        aurita(): stolzmanni;
-        geoffrensis(): caniventer;
-        theresa(): marmosurus<netscheri<siberu<foina, pallidus>, luctuosa>, dolichurus<lepturus, pallidus>>;
-        melanocarpus(): albidens<siberu<foina, pallidus>, sumatrana>;
-        dubiaquercus(): robustulus;
-        pectoralis(): sumatrana;
-        apoensis(): megaphyllus;
-        grisescens(): jugularis;
-        ramirohitra(): amphibius<falconeri, echinatus>;
+        weddellii(): dolichurus<dogramacii.aurata, julianae.steerii>;
+        echinothrix(): Lanthanum.nitidus<panglima.amphibius<caurinus.megaphyllus, lavali.lepturus>, argurus.oreas>;
+        garridoi(): dogramacii.koepckeae;
+        rouxii(): gracilis<argurus.dauricus<macrorhinos.konganensis, patas.uralensis>, thalia<patas.uralensis, julianae.galapagoensis>>;
+        aurita(): sagitta.stolzmanni;
+        geoffrensis(): rionegrensis.caniventer;
+        theresa(): macrorhinos.marmosurus<argurus.netscheri<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, argurus.luctuosa>, dolichurus<lavali.lepturus, samarensis.pallidus>>;
+        melanocarpus(): julianae.albidens<dammermani.siberu<lutreolus.foina, samarensis.pallidus>, julianae.sumatrana>;
+        dubiaquercus(): dogramacii.robustulus;
+        pectoralis(): julianae.sumatrana;
+        apoensis(): caurinus.megaphyllus;
+        grisescens(): Lanthanum.jugularis;
+        ramirohitra(): panglima.amphibius<trivirgatus.falconeri, gabriellae.echinatus>;
     }
 }
 declare module samarensis {
-    class pelurus<T0, T1> extends stolzmanni {
-        Palladium(): linulus<konganensis, caniventer>;
-        castanea(): netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>;
-        chamek(): pygmaea<galapagoensis, melanoleuca>;
-        nigriceps(): punicus;
-        lunatus(): pelurus<jugularis, walkeri>;
-        madurae(): caniventer;
-        chinchilla(): daphaenodon;
-        eliasi(): rosalia<steerii, beisa>;
-        proditor(): setulosus<echinatus, steerii>;
-        gambianus(): wattsi<galapagoensis, linulus<xanthognathus, konganensis>>;
-        petteri(): kaiseri;
-        nusatenggara(): amphibius<lepturus, carolinensis>;
-        olitor(): veraecrucis<xanthognathus, bobrinskoi>;
+    class pelurus<T0, T1> extends sagitta.stolzmanni {
+        Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>;
+        castanea(): argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>;
+        chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>;
+        nigriceps(): lutreolus.punicus;
+        lunatus(): pelurus<Lanthanum.jugularis, sagitta.walkeri>;
+        madurae(): rionegrensis.caniventer;
+        chinchilla(): macrorhinos.daphaenodon;
+        eliasi(): petrophilus.rosalia<julianae.steerii, lavali.beisa>;
+        proditor(): panamensis.setulosus<gabriellae.echinatus, julianae.steerii>;
+        gambianus(): quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>;
+        petteri(): dogramacii.kaiseri;
+        nusatenggara(): panglima.amphibius<lavali.lepturus, quasiater.carolinensis>;
+        olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>;
     }
-    class fuscus<T0, T1> extends daphaenodon {
-        planifrons(): gracilis<nudicaudus, aurata>;
-        badia(): sumatrana;
-        prymnolopha(): walkeri;
-        natalensis(): falconeri;
-        hunteri(): durangae;
+    class fuscus<T0, T1> extends macrorhinos.daphaenodon {
+        planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>;
+        badia(): julianae.sumatrana;
+        prymnolopha(): sagitta.walkeri;
+        natalensis(): trivirgatus.falconeri;
+        hunteri(): julianae.durangae;
         sapiens(): pallidus;
-        macrocercus(): setulosus<koepckeae, sumatrana>;
-        nimbae(): punicus;
-        suricatta(): nigricans<melanops, subspinosus>;
-        jagorii(): galapagoensis;
-        beecrofti(): stolzmanni;
-        imaizumii(): inez<gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>, konganensis>;
-        colocolo(): bobrinskoi;
-        wolfi(): rosalia<megalonyx, abidi<kaiseri, wilsoni>>;
+        macrocercus(): panamensis.setulosus<dogramacii.koepckeae, julianae.sumatrana>;
+        nimbae(): lutreolus.punicus;
+        suricatta(): daubentonii.nigricans<dammermani.melanops, imperfecta.subspinosus>;
+        jagorii(): julianae.galapagoensis;
+        beecrofti(): sagitta.stolzmanni;
+        imaizumii(): minutus.inez<julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>, macrorhinos.konganensis>;
+        colocolo(): quasiater.bobrinskoi;
+        wolfi(): petrophilus.rosalia<Lanthanum.megalonyx, panglima.abidi<dogramacii.kaiseri, lavali.wilsoni>>;
     }
     class pallidus {
-        oblativa(): falconeri;
-        watersi(): wilsoni;
-        glacialis(): cinereus<caucasica<sumatrana, oconnelli>, wattsi<galapagoensis, linulus<xanthognathus, konganensis>>>;
-        viaria(): sarasinorum<xanthognathus, punicus>;
+        oblativa(): trivirgatus.falconeri;
+        watersi(): lavali.wilsoni;
+        glacialis(): sagitta.cinereus<nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>, quasiater.wattsi<julianae.galapagoensis, panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>>>;
+        viaria(): chrysaeolus.sarasinorum<lavali.xanthognathus, lutreolus.punicus>;
     }
     class cahirinus<T0, T1> {
-        alashanicus(): caucasica<americanus, peninsulae>;
-        flaviventer(): tumidifrons<thaeleri, arboreus<minutilla, peninsulae>>;
-        bottai(): schlegeli;
-        pinetis(): oreas;
-        saussurei(): crenulata<klossii<nudicaudus, aurata>, netscheri<inez<peninsulae, nudicaudus>, oralis<xanthognathus, oreas>>>;
+        alashanicus(): nigra.caucasica<ruatanica.americanus, argurus.peninsulae>;
+        flaviventer(): trivirgatus.tumidifrons<lavali.thaeleri, daubentonii.arboreus<petrophilus.minutilla, argurus.peninsulae>>;
+        bottai(): lutreolus.schlegeli;
+        pinetis(): argurus.oreas;
+        saussurei(): rendalli.crenulata<gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>, argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>>;
     }
 }
 declare module sagitta {
-    class leptoceros<T0, T1> extends johorensis<peninsulae, arboreus<germaini, stolzmanni>> {
-        victus(): caniventer;
-        hoplomyoides(): fundatus<gerbillus<subspinosus, durangae>, gracilis<luctuosa, subspinosus>>;
-        gratiosus(): lepturus;
-        rex(): wilsoni;
-        bolami(): tumidifrons<schlegeli, americanus>;
+    class leptoceros<T0, T1> extends caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, stolzmanni>> {
+        victus(): rionegrensis.caniventer;
+        hoplomyoides(): panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>;
+        gratiosus(): lavali.lepturus;
+        rex(): lavali.wilsoni;
+        bolami(): trivirgatus.tumidifrons<lutreolus.schlegeli, ruatanica.americanus>;
     }
 }
 declare module daubentonii {
-    class nigricans<T0, T1> extends stolzmanni {
-        woosnami(): robustulus;
+    class nigricans<T0, T1> extends sagitta.stolzmanni {
+        woosnami(): dogramacii.robustulus;
     }
 }
 declare module dammermani {
@@ -8003,123 +8003,123 @@ declare module dammermani {
     }
 }
 declare module argurus {
-    class pygmaea<T0, T1> extends moojeni<konganensis, echinatus> {
-        pajeros(): echinatus;
-        capucinus(): zuluensis;
-        cuvieri(): caniventer;
+    class pygmaea<T0, T1> extends rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus> {
+        pajeros(): gabriellae.echinatus;
+        capucinus(): rendalli.zuluensis;
+        cuvieri(): rionegrensis.caniventer;
     }
 }
 declare module chrysaeolus {
-    class sarasinorum<T0, T1> extends psilurus {
-        belzebul(): pallidus;
-        hinpoon(): caucasica<sumatrana, oconnelli>;
-        kandti(): wattsi<jugularis, sumatrana>;
-        cynosuros(): melanops;
-        Germanium(): beisa;
-        Ununoctium(): gracilis<xanthognathus, melanoleuca>;
-        princeps(): portoricensis;
+    class sarasinorum<T0, T1> extends caurinus.psilurus {
+        belzebul(): samarensis.pallidus;
+        hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>;
+        kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>;
+        cynosuros(): dammermani.melanops;
+        Germanium(): lavali.beisa;
+        Ununoctium(): nigra.gracilis<lavali.xanthognathus, provocax.melanoleuca>;
+        princeps(): minutus.portoricensis;
     }
 }
 declare module argurus {
     class wetmorei<T0, T1> {
-        leucoptera(): rosalia<koepckeae, foina>;
-        ochraventer(): walkeri;
-        tephromelas(): jugularis;
-        cracens(): gilbertii<thaeleri, punicus>;
-        jamaicensis(): thalia<marcanoi, veraecrucis<falconeri, carolinensis>>;
-        gymnocaudus(): aurata;
-        mayori(): stolzmanni;
+        leucoptera(): petrophilus.rosalia<dogramacii.koepckeae, lutreolus.foina>;
+        ochraventer(): sagitta.walkeri;
+        tephromelas(): Lanthanum.jugularis;
+        cracens(): gilbertii<lavali.thaeleri, lutreolus.punicus>;
+        jamaicensis(): nigra.thalia<howi.marcanoi, rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>>;
+        gymnocaudus(): dogramacii.aurata;
+        mayori(): sagitta.stolzmanni;
     }
 }
 declare module argurus {
-    class oreas extends wilsoni {
-        salamonis(): xanthognathus;
-        paniscus(): Praseodymium<psilurus, xanthognathus>;
-        fagani(): oconnelli;
-        papuanus(): fundatus<carolinensis, daphaenodon>;
-        timidus(): melanops;
-        nghetinhensis(): klossii<luctuosa, steerii>;
-        barbei(): cahirinus<lepturus, carolinensis>;
+    class oreas extends lavali.wilsoni {
+        salamonis(): lavali.xanthognathus;
+        paniscus(): ruatanica.Praseodymium<caurinus.psilurus, lavali.xanthognathus>;
+        fagani(): trivirgatus.oconnelli;
+        papuanus(): panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>;
+        timidus(): dammermani.melanops;
+        nghetinhensis(): gabriellae.klossii<luctuosa, julianae.steerii>;
+        barbei(): samarensis.cahirinus<lavali.lepturus, quasiater.carolinensis>;
         univittatus(): peninsulae;
     }
 }
 declare module daubentonii {
     class arboreus<T0, T1> {
-        capreolus(): crenulata<pelurus<jugularis, americanus>, wilsoni>;
-        moreni(): abidi<galapagoensis, koepckeae>;
-        hypoleucos(): gracilis<falconeri, germaini>;
-        paedulcus(): portoricensis;
-        pucheranii(): fuscus<durangae, megaphyllus>;
-        stella(): oralis<foina, carolinensis>;
-        brasiliensis(): subspinosus;
-        brevicaudata(): oconnelli;
-        vitticollis(): koepckeae;
-        huangensis(): psilurus;
-        cameroni(): rosalia<siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>, psilurus>;
-        tianshanica(): marcanoi;
+        capreolus(): rendalli.crenulata<samarensis.pelurus<Lanthanum.jugularis, ruatanica.americanus>, lavali.wilsoni>;
+        moreni(): panglima.abidi<julianae.galapagoensis, dogramacii.koepckeae>;
+        hypoleucos(): nigra.gracilis<trivirgatus.falconeri, argurus.germaini>;
+        paedulcus(): minutus.portoricensis;
+        pucheranii(): samarensis.fuscus<julianae.durangae, caurinus.megaphyllus>;
+        stella(): julianae.oralis<lutreolus.foina, quasiater.carolinensis>;
+        brasiliensis(): imperfecta.subspinosus;
+        brevicaudata(): trivirgatus.oconnelli;
+        vitticollis(): dogramacii.koepckeae;
+        huangensis(): caurinus.psilurus;
+        cameroni(): petrophilus.rosalia<dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, caurinus.psilurus>;
+        tianshanica(): howi.marcanoi;
     }
 }
 declare module patas {
     class uralensis {
-        cartilagonodus(): nitidus<caniventer, jugularis>;
-        pyrrhinus(): beisa;
-        insulans(): jugularis;
-        nigricauda(): johorensis<nitidus<minutilla, sumatrana>, jugularis>;
-        muricauda(): fundatus<foina, siberu<punicus, acariensis>>;
-        albicaudus(): stolzmanni;
-        fallax(): hector<punicus, amicus>;
-        attenuata(): marmosurus<americanus, netscheri<carolinensis, kaiseri>>;
-        megalura(): marcanoi;
-        neblina(): pelurus<daphaenodon, caniventer>;
-        citellus(): arboreus<carolinensis, caniventer>;
-        tanezumi(): lasiurus<robustulus, psilurus>;
-        albiventer(): crenulata<zuluensis, robustulus>;
+        cartilagonodus(): Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>;
+        pyrrhinus(): lavali.beisa;
+        insulans(): Lanthanum.jugularis;
+        nigricauda(): caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis>;
+        muricauda(): panglima.fundatus<lutreolus.foina, dammermani.siberu<lutreolus.punicus, julianae.acariensis>>;
+        albicaudus(): sagitta.stolzmanni;
+        fallax(): ruatanica.hector<lutreolus.punicus, gabriellae.amicus>;
+        attenuata(): macrorhinos.marmosurus<ruatanica.americanus, argurus.netscheri<quasiater.carolinensis, dogramacii.kaiseri>>;
+        megalura(): howi.marcanoi;
+        neblina(): samarensis.pelurus<macrorhinos.daphaenodon, rionegrensis.caniventer>;
+        citellus(): daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>;
+        tanezumi(): imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus>;
+        albiventer(): rendalli.crenulata<rendalli.zuluensis, dogramacii.robustulus>;
     }
 }
 declare module provocax {
-    class melanoleuca extends wilsoni {
-        Neodymium(): marmosurus<sodyi<falconeri, bobrinskoi>, foina>;
-        baeri(): lasiurus<lepturus, americanus>;
+    class melanoleuca extends lavali.wilsoni {
+        Neodymium(): macrorhinos.marmosurus<petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>, lutreolus.foina>;
+        baeri(): imperfecta.lasiurus<lavali.lepturus, ruatanica.americanus>;
     }
 }
 declare module sagitta {
     class sicarius<T0, T1> {
-        Chlorine(): cahirinus<gracilis<luctuosa, subspinosus>, robustulus>;
-        simulator(): marmosurus<nitidus<melanops, lepturus>, marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>>;
+        Chlorine(): samarensis.cahirinus<nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>, dogramacii.robustulus>;
+        simulator(): macrorhinos.marmosurus<Lanthanum.nitidus<dammermani.melanops, lavali.lepturus>, macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, stolzmanni>>;
     }
 }
 declare module howi {
-    class marcanoi extends megalonyx {
-        formosae(): megalonyx;
-        dudui(): punicus;
-        leander(): nesiotes<megalonyx, portoricensis>;
-        martinsi(): aurata;
-        beatrix(): ciliolabrum<melanoleuca, amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>>;
-        griseoventer(): oreas;
-        zerda(): wattsi<oralis<steerii, lepturus>, coludo<steerii, gerbillus<thaeleri, carolinensis>>>;
-        yucatanicus(): nudicaudus;
-        nigrita(): peninsulae;
-        jouvenetae(): dauricus<germaini, durangae>;
-        indefessus(): walkeri;
-        vuquangensis(): daphaenodon;
-        Zirconium(): thaeleri;
-        hyaena(): oralis<beisa, oreas>;
+    class marcanoi extends Lanthanum.megalonyx {
+        formosae(): Lanthanum.megalonyx;
+        dudui(): lutreolus.punicus;
+        leander(): daubentonii.nesiotes<Lanthanum.megalonyx, minutus.portoricensis>;
+        martinsi(): dogramacii.aurata;
+        beatrix(): imperfecta.ciliolabrum<provocax.melanoleuca, panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>>;
+        griseoventer(): argurus.oreas;
+        zerda(): quasiater.wattsi<julianae.oralis<julianae.steerii, lavali.lepturus>, coludo<julianae.steerii, julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>>>;
+        yucatanicus(): julianae.nudicaudus;
+        nigrita(): argurus.peninsulae;
+        jouvenetae(): argurus.dauricus<argurus.germaini, julianae.durangae>;
+        indefessus(): sagitta.walkeri;
+        vuquangensis(): macrorhinos.daphaenodon;
+        Zirconium(): lavali.thaeleri;
+        hyaena(): julianae.oralis<lavali.beisa, argurus.oreas>;
     }
 }
 declare module argurus {
     class gilbertii<T0, T1> {
-        nasutus(): lepturus;
-        poecilops(): steerii;
-        sondaicus(): fuscus<peninsulae, lepturus>;
-        auriventer(): rosalia<xanthognathus, oconnelli>;
-        cherriei(): Praseodymium<jugularis, oreas>;
-        lindberghi(): inez<zuluensis, caniventer>;
-        pipistrellus(): carolinensis;
-        paranus(): punicus;
-        dubosti(): thalia<schlegeli, sumatrana>;
-        opossum(): dolichurus<lepturus, pallidus>;
-        oreopolus(): portoricensis;
-        amurensis(): arboreus<otion, konganensis>;
+        nasutus(): lavali.lepturus;
+        poecilops(): julianae.steerii;
+        sondaicus(): samarensis.fuscus<peninsulae, lavali.lepturus>;
+        auriventer(): petrophilus.rosalia<lavali.xanthognathus, trivirgatus.oconnelli>;
+        cherriei(): ruatanica.Praseodymium<Lanthanum.jugularis, oreas>;
+        lindberghi(): minutus.inez<rendalli.zuluensis, rionegrensis.caniventer>;
+        pipistrellus(): quasiater.carolinensis;
+        paranus(): lutreolus.punicus;
+        dubosti(): nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>;
+        opossum(): nigra.dolichurus<lavali.lepturus, samarensis.pallidus>;
+        oreopolus(): minutus.portoricensis;
+        amurensis(): daubentonii.arboreus<lavali.otion, macrorhinos.konganensis>;
     }
 }
 declare module petrophilus {
@@ -8128,45 +8128,45 @@ declare module petrophilus {
 }
 declare module lutreolus {
     class punicus {
-        strandi(): klossii<jugularis, jugularis>;
-        lar(): mahaganus<nudicaudus, otion>;
-        erica(): koepckeae;
-        trichura(): konganensis;
-        lemniscatus(): fundatus<amicus, foina>;
-        aspalax(): linulus<xanthognathus, konganensis>;
-        marshalli(): nudicaudus;
-        Zinc(): galapagoensis;
-        monochromos(): coludo<lepturus, punicus>;
-        purinus(): hector<schlegeli, melanoleuca>;
-        ischyrus(): lepturus;
-        tenuis(): daphaenodon;
-        Helium(): acariensis;
+        strandi(): gabriellae.klossii<Lanthanum.jugularis, Lanthanum.jugularis>;
+        lar(): caurinus.mahaganus<julianae.nudicaudus, lavali.otion>;
+        erica(): dogramacii.koepckeae;
+        trichura(): macrorhinos.konganensis;
+        lemniscatus(): panglima.fundatus<gabriellae.amicus, foina>;
+        aspalax(): panamensis.linulus<lavali.xanthognathus, macrorhinos.konganensis>;
+        marshalli(): julianae.nudicaudus;
+        Zinc(): julianae.galapagoensis;
+        monochromos(): howi.coludo<lavali.lepturus, punicus>;
+        purinus(): ruatanica.hector<schlegeli, provocax.melanoleuca>;
+        ischyrus(): lavali.lepturus;
+        tenuis(): macrorhinos.daphaenodon;
+        Helium(): julianae.acariensis;
     }
 }
 declare module macrorhinos {
     class daphaenodon {
-        bredanensis(): sumatrana;
-        othus(): coludo<oreas, marcanoi>;
-        hammondi(): gerbillus<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, otion>;
-        aureocollaris(): carolinensis;
-        flavipes(): minutilla;
-        callosus(): lotor<foina, robustulus>;
+        bredanensis(): julianae.sumatrana;
+        othus(): howi.coludo<argurus.oreas, howi.marcanoi>;
+        hammondi(): julianae.gerbillus<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, lavali.otion>;
+        aureocollaris(): quasiater.carolinensis;
+        flavipes(): petrophilus.minutilla;
+        callosus(): trivirgatus.lotor<lutreolus.foina, dogramacii.robustulus>;
     }
 }
 declare module sagitta {
     class cinereus<T0, T1> {
-        zunigae(): crenulata<konganensis, dolichurus<lepturus, pallidus>>;
-        microps(): nigricans<megaphyllus, wattsi<jugularis, sumatrana>>;
-        guaporensis(): arboreus<amicus, germaini>;
-        tonkeana(): fundatus<minutilla, melanops>;
-        montensis(): siberu<aurata, oconnelli>;
-        sphinx(): portoricensis;
-        glis(): wetmorei<oreas, marcanoi>;
-        dorsalis(): sodyi<luctuosa, sumatrana>;
-        fimbriatus(): melanoleuca;
-        sara(): gracilis<luctuosa, subspinosus>;
+        zunigae(): rendalli.crenulata<macrorhinos.konganensis, nigra.dolichurus<lavali.lepturus, samarensis.pallidus>>;
+        microps(): daubentonii.nigricans<caurinus.megaphyllus, quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>>;
+        guaporensis(): daubentonii.arboreus<gabriellae.amicus, argurus.germaini>;
+        tonkeana(): panglima.fundatus<petrophilus.minutilla, dammermani.melanops>;
+        montensis(): dammermani.siberu<dogramacii.aurata, trivirgatus.oconnelli>;
+        sphinx(): minutus.portoricensis;
+        glis(): argurus.wetmorei<argurus.oreas, howi.marcanoi>;
+        dorsalis(): petrophilus.sodyi<argurus.luctuosa, julianae.sumatrana>;
+        fimbriatus(): provocax.melanoleuca;
+        sara(): nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>;
         epimelas(): stolzmanni;
-        pittieri(): fuscus<carolinensis, stolzmanni>;
+        pittieri(): samarensis.fuscus<quasiater.carolinensis, stolzmanni>;
     }
 }
 declare module nigra {
@@ -8174,253 +8174,253 @@ declare module nigra {
     }
 }
 declare module gabriellae {
-    class klossii<T0, T1> extends lasiurus<robustulus, psilurus> {
+    class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
     }
     class amicus {
-        pirrensis(): luctuosa;
-        phaeura(): abidi<foina, peninsulae>;
-        voratus(): thaeleri;
-        satarae(): lotor<luctuosa, wilsoni>;
-        hooperi(): psilurus;
-        perrensi(): crenulata<falconeri, marcanoi>;
-        ridei(): hector<sumatrana, pelurus<jugularis, walkeri>>;
-        audeberti(): arboreus<kaiseri, punicus>;
-        Lutetium(): marmosurus<stolzmanni, thaeleri>;
-        atrox(): fuscus<oralis<steerii, lepturus>, koepckeae>;
+        pirrensis(): argurus.luctuosa;
+        phaeura(): panglima.abidi<lutreolus.foina, argurus.peninsulae>;
+        voratus(): lavali.thaeleri;
+        satarae(): trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>;
+        hooperi(): caurinus.psilurus;
+        perrensi(): rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>;
+        ridei(): ruatanica.hector<julianae.sumatrana, samarensis.pelurus<Lanthanum.jugularis, sagitta.walkeri>>;
+        audeberti(): daubentonii.arboreus<dogramacii.kaiseri, lutreolus.punicus>;
+        Lutetium(): macrorhinos.marmosurus<sagitta.stolzmanni, lavali.thaeleri>;
+        atrox(): samarensis.fuscus<julianae.oralis<julianae.steerii, lavali.lepturus>, dogramacii.koepckeae>;
     }
     class echinatus {
-        tenuipes(): coludo<daphaenodon, amphibius<daphaenodon, uralensis>>;
+        tenuipes(): howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>;
     }
 }
 declare module imperfecta {
     class lasiurus<T0, T1> {
-        marisae(): thaeleri;
-        fulvus(): germaini;
-        paranaensis(): koepckeae;
-        didactylus(): abidi<aurata, sarasinorum<megaphyllus, xanthognathus>>;
-        schreibersii(): gracilis<luctuosa, americanus>;
-        orii(): kaiseri;
+        marisae(): lavali.thaeleri;
+        fulvus(): argurus.germaini;
+        paranaensis(): dogramacii.koepckeae;
+        didactylus(): panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>;
+        schreibersii(): nigra.gracilis<argurus.luctuosa, ruatanica.americanus>;
+        orii(): dogramacii.kaiseri;
     }
     class subspinosus {
-        monticularis(): konganensis;
-        Gadolinium(): caucasica<stolzmanni, uralensis>;
-        oasicus(): johorensis<peninsulae, arboreus<germaini, stolzmanni>>;
-        paterculus(): punicus;
-        punctata(): thaeleri;
-        invictus(): stolzmanni;
-        stangeri(): minutilla;
-        siskiyou(): inez<konganensis, pallidus>;
-        welwitschii(): caniventer;
-        Polonium(): wilsoni;
-        harpia(): luctuosa;
+        monticularis(): macrorhinos.konganensis;
+        Gadolinium(): nigra.caucasica<sagitta.stolzmanni, patas.uralensis>;
+        oasicus(): caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>>;
+        paterculus(): lutreolus.punicus;
+        punctata(): lavali.thaeleri;
+        invictus(): sagitta.stolzmanni;
+        stangeri(): petrophilus.minutilla;
+        siskiyou(): minutus.inez<macrorhinos.konganensis, samarensis.pallidus>;
+        welwitschii(): rionegrensis.caniventer;
+        Polonium(): lavali.wilsoni;
+        harpia(): argurus.luctuosa;
     }
-    class ciliolabrum<T0, T1> extends robustulus {
-        leschenaultii(): dauricus<jugularis, Praseodymium<germaini, megaphyllus>>;
-        ludia(): johorensis<caniventer, punicus>;
-        sinicus(): marmosurus<daphaenodon, amicus>;
+    class ciliolabrum<T0, T1> extends dogramacii.robustulus {
+        leschenaultii(): argurus.dauricus<Lanthanum.jugularis, ruatanica.Praseodymium<argurus.germaini, caurinus.megaphyllus>>;
+        ludia(): caurinus.johorensis<rionegrensis.caniventer, lutreolus.punicus>;
+        sinicus(): macrorhinos.marmosurus<macrorhinos.daphaenodon, gabriellae.amicus>;
     }
 }
 declare module quasiater {
     class wattsi<T0, T1> {
-        lagotis(): xanthognathus;
-        hussoni(): wilsoni;
-        bilarni(): cahirinus<crenulata<wilsoni, fundatus<amicus, foina>>, koepckeae>;
-        cabrerae(): lepturus;
+        lagotis(): lavali.xanthognathus;
+        hussoni(): lavali.wilsoni;
+        bilarni(): samarensis.cahirinus<rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>, dogramacii.koepckeae>;
+        cabrerae(): lavali.lepturus;
     }
 }
 declare module butleri {
 }
 declare module petrophilus {
-    class sodyi<T0, T1> extends bobrinskoi {
-        saundersiae(): pallidus;
-        imberbis(): carolinensis;
-        cansdalei(): melanops;
-        Lawrencium(): dolichurus<sumatrana, subspinosus>;
-        catta(): oreas;
-        breviceps(): dauricus<aurata, melanops>;
-        transitionalis(): zuluensis;
-        heptneri(): germaini;
-        bairdii(): beisa;
+    class sodyi<T0, T1> extends quasiater.bobrinskoi {
+        saundersiae(): samarensis.pallidus;
+        imberbis(): quasiater.carolinensis;
+        cansdalei(): dammermani.melanops;
+        Lawrencium(): nigra.dolichurus<julianae.sumatrana, imperfecta.subspinosus>;
+        catta(): argurus.oreas;
+        breviceps(): argurus.dauricus<dogramacii.aurata, dammermani.melanops>;
+        transitionalis(): rendalli.zuluensis;
+        heptneri(): argurus.germaini;
+        bairdii(): lavali.beisa;
     }
 }
 declare module caurinus {
-    class megaphyllus extends lasiurus<acariensis, coludo<oreas, marcanoi>> {
-        montana(): oreas;
-        amatus(): schlegeli;
-        bucculentus(): echinatus;
-        lepida(): crenulata<wilsoni, fundatus<amicus, foina>>;
-        graecus(): kaiseri;
-        forsteri(): minutilla;
-        perotensis(): cahirinus<portoricensis, lepturus>;
-        cirrhosus(): carolinensis;
+    class megaphyllus extends imperfecta.lasiurus<julianae.acariensis, howi.coludo<argurus.oreas, howi.marcanoi>> {
+        montana(): argurus.oreas;
+        amatus(): lutreolus.schlegeli;
+        bucculentus(): gabriellae.echinatus;
+        lepida(): rendalli.crenulata<lavali.wilsoni, panglima.fundatus<gabriellae.amicus, lutreolus.foina>>;
+        graecus(): dogramacii.kaiseri;
+        forsteri(): petrophilus.minutilla;
+        perotensis(): samarensis.cahirinus<minutus.portoricensis, lavali.lepturus>;
+        cirrhosus(): quasiater.carolinensis;
     }
 }
 declare module minutus {
     class portoricensis {
-        relictus(): carolinensis;
-        aequatorianus(): klossii<nudicaudus, aurata>;
-        rhinogradoides(): cahirinus<carolinensis, durangae>;
+        relictus(): quasiater.carolinensis;
+        aequatorianus(): gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>;
+        rhinogradoides(): samarensis.cahirinus<quasiater.carolinensis, julianae.durangae>;
     }
 }
 declare module lutreolus {
     class foina {
         tarfayensis(): punicus;
-        Promethium(): pelurus<germaini, durangae>;
-        salinae(): klossii<konganensis, carolinensis>;
-        kerri(): coludo<carolinensis, portoricensis>;
-        scotti(): wattsi<konganensis, robustulus>;
-        camerunensis(): gerbillus<subspinosus, durangae>;
-        affinis(): germaini;
-        siebersi(): lotor<oreas, thalia<uralensis, wilsoni>>;
-        maquassiensis(): oconnelli;
-        layardi(): albidens<marcanoi, koepckeae>;
-        bishopi(): aurata;
-        apodemoides(): psilurus;
-        argentiventer(): mixtus<amicus, punicus>;
+        Promethium(): samarensis.pelurus<argurus.germaini, julianae.durangae>;
+        salinae(): gabriellae.klossii<macrorhinos.konganensis, quasiater.carolinensis>;
+        kerri(): howi.coludo<quasiater.carolinensis, minutus.portoricensis>;
+        scotti(): quasiater.wattsi<macrorhinos.konganensis, dogramacii.robustulus>;
+        camerunensis(): julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>;
+        affinis(): argurus.germaini;
+        siebersi(): trivirgatus.lotor<argurus.oreas, nigra.thalia<patas.uralensis, lavali.wilsoni>>;
+        maquassiensis(): trivirgatus.oconnelli;
+        layardi(): julianae.albidens<howi.marcanoi, dogramacii.koepckeae>;
+        bishopi(): dogramacii.aurata;
+        apodemoides(): caurinus.psilurus;
+        argentiventer(): trivirgatus.mixtus<gabriellae.amicus, punicus>;
     }
 }
 declare module lutreolus {
-    class cor<T0, T1> extends fundatus<linulus<lotor<luctuosa, wilsoni>, beisa>, melanops> {
-        antinorii(): sodyi<carolinensis, germaini>;
-        voi(): johorensis<melanops, konganensis>;
-        mussoi(): carolinensis;
-        truncatus(): lotor<stolzmanni, foina>;
-        achates(): melanoleuca;
-        praedatrix(): angulatus<kaiseri, steerii>;
-        mzabi(): wattsi<lotor<steerii, pallidus>, inez<oconnelli, jugularis>>;
-        xanthinus(): gracilis<linulus<kaiseri, portoricensis>, marcanoi>;
-        tapoatafa(): megaphyllus;
-        castroviejoi(): jugularis;
+    class cor<T0, T1> extends panglima.fundatus<panamensis.linulus<trivirgatus.lotor<argurus.luctuosa, lavali.wilsoni>, lavali.beisa>, dammermani.melanops> {
+        antinorii(): petrophilus.sodyi<quasiater.carolinensis, argurus.germaini>;
+        voi(): caurinus.johorensis<dammermani.melanops, macrorhinos.konganensis>;
+        mussoi(): quasiater.carolinensis;
+        truncatus(): trivirgatus.lotor<sagitta.stolzmanni, foina>;
+        achates(): provocax.melanoleuca;
+        praedatrix(): howi.angulatus<dogramacii.kaiseri, julianae.steerii>;
+        mzabi(): quasiater.wattsi<trivirgatus.lotor<julianae.steerii, samarensis.pallidus>, minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>>;
+        xanthinus(): nigra.gracilis<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, howi.marcanoi>;
+        tapoatafa(): caurinus.megaphyllus;
+        castroviejoi(): Lanthanum.jugularis;
     }
 }
 declare module howi {
     class coludo<T0, T1> {
-        bernhardi(): punicus;
-        isseli(): germaini;
+        bernhardi(): lutreolus.punicus;
+        isseli(): argurus.germaini;
     }
 }
 declare module argurus {
-    class germaini extends amicus {
-        sharpei(): wilsoni;
-        palmarum(): marmosurus<megalonyx, thaeleri>;
+    class germaini extends gabriellae.amicus {
+        sharpei(): lavali.wilsoni;
+        palmarum(): macrorhinos.marmosurus<Lanthanum.megalonyx, lavali.thaeleri>;
     }
 }
 declare module sagitta {
     class stolzmanni {
-        riparius(): dolichurus<koepckeae, psilurus>;
-        dhofarensis(): foina;
-        tricolor(): germaini;
-        gardneri(): xanthognathus;
-        walleri(): moojeni<sarasinorum<megaphyllus, xanthognathus>, echinatus>;
-        talpoides(): echinatus;
-        pallipes(): melanops;
-        lagurus(): beisa;
-        hipposideros(): albidens<luctuosa, echinatus>;
-        griselda(): psilurus;
-        florium(): zuluensis;
+        riparius(): nigra.dolichurus<dogramacii.koepckeae, caurinus.psilurus>;
+        dhofarensis(): lutreolus.foina;
+        tricolor(): argurus.germaini;
+        gardneri(): lavali.xanthognathus;
+        walleri(): rendalli.moojeni<chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>, gabriellae.echinatus>;
+        talpoides(): gabriellae.echinatus;
+        pallipes(): dammermani.melanops;
+        lagurus(): lavali.beisa;
+        hipposideros(): julianae.albidens<argurus.luctuosa, gabriellae.echinatus>;
+        griselda(): caurinus.psilurus;
+        florium(): rendalli.zuluensis;
     }
 }
 declare module dammermani {
-    class melanops extends inez<stolzmanni, melanops> {
+    class melanops extends minutus.inez<sagitta.stolzmanni, melanops> {
         blarina(): melanops;
-        harwoodi(): veraecrucis<dolichurus<lepturus, pallidus>, wilsoni>;
-        ashaninka(): nudicaudus;
-        wiedii(): steerii;
-        godmani(): subspinosus;
-        condorensis(): ciliolabrum<pallidus, psilurus>;
-        xerophila(): abidi<portoricensis, uralensis>;
-        laminatus(): fundatus<marcanoi, fuscus<wilsoni, sarasinorum<jugularis, subspinosus>>>;
-        archeri(): marcanoi;
-        hidalgo(): inez<oconnelli, jugularis>;
-        unicolor(): schlegeli;
-        philippii(): gracilis<walkeri, stolzmanni>;
-        bocagei(): albidens<wilsoni, thaeleri>;
+        harwoodi(): rionegrensis.veraecrucis<nigra.dolichurus<lavali.lepturus, samarensis.pallidus>, lavali.wilsoni>;
+        ashaninka(): julianae.nudicaudus;
+        wiedii(): julianae.steerii;
+        godmani(): imperfecta.subspinosus;
+        condorensis(): imperfecta.ciliolabrum<samarensis.pallidus, caurinus.psilurus>;
+        xerophila(): panglima.abidi<minutus.portoricensis, patas.uralensis>;
+        laminatus(): panglima.fundatus<howi.marcanoi, samarensis.fuscus<lavali.wilsoni, chrysaeolus.sarasinorum<Lanthanum.jugularis, imperfecta.subspinosus>>>;
+        archeri(): howi.marcanoi;
+        hidalgo(): minutus.inez<trivirgatus.oconnelli, Lanthanum.jugularis>;
+        unicolor(): lutreolus.schlegeli;
+        philippii(): nigra.gracilis<sagitta.walkeri, sagitta.stolzmanni>;
+        bocagei(): julianae.albidens<lavali.wilsoni, lavali.thaeleri>;
     }
 }
 declare module argurus {
-    class peninsulae extends uralensis {
-        aitkeni(): mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>;
-        novaeangliae(): xanthognathus;
-        olallae(): sumatrana;
-        anselli(): aurata;
-        timminsi(): konganensis;
-        sordidus(): moojeni<konganensis, echinatus>;
-        telfordi(): oconnelli;
-        cavernarum(): inez<echinatus, luctuosa>;
+    class peninsulae extends patas.uralensis {
+        aitkeni(): trivirgatus.mixtus<dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>;
+        novaeangliae(): lavali.xanthognathus;
+        olallae(): julianae.sumatrana;
+        anselli(): dogramacii.aurata;
+        timminsi(): macrorhinos.konganensis;
+        sordidus(): rendalli.moojeni<macrorhinos.konganensis, gabriellae.echinatus>;
+        telfordi(): trivirgatus.oconnelli;
+        cavernarum(): minutus.inez<gabriellae.echinatus, luctuosa>;
     }
 }
 declare module argurus {
     class netscheri<T0, T1> {
-        gravis(): caucasica<crenulata<falconeri, marcanoi>, kaiseri>;
-        ruschii(): lasiurus<marcanoi, ciliolabrum<megalonyx, minutilla>>;
-        tricuspidatus(): wilsoni;
-        fernandezi(): siberu<thalia<schlegeli, sumatrana>, abidi<foina, peninsulae>>;
-        colletti(): pallidus;
-        microbullatus(): schlegeli;
-        eburneae(): sarasinorum<konganensis, acariensis>;
-        tatei(): pygmaea<oreas, fundatus<carolinensis, daphaenodon>>;
-        millardi(): walkeri;
-        pruinosus(): falconeri;
-        delator(): netscheri<kaiseri, lepturus>;
-        nyikae(): tumidifrons<angulatus<coludo<carolinensis, portoricensis>, minutilla>, acariensis>;
-        ruemmleri(): amphibius<inez<moojeni<amphibius<falconeri, psilurus>, echinatus>, aurata>, ciliolabrum<carolinensis, beisa>>;
+        gravis(): nigra.caucasica<rendalli.crenulata<trivirgatus.falconeri, howi.marcanoi>, dogramacii.kaiseri>;
+        ruschii(): imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>;
+        tricuspidatus(): lavali.wilsoni;
+        fernandezi(): dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, peninsulae>>;
+        colletti(): samarensis.pallidus;
+        microbullatus(): lutreolus.schlegeli;
+        eburneae(): chrysaeolus.sarasinorum<macrorhinos.konganensis, julianae.acariensis>;
+        tatei(): pygmaea<oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>>;
+        millardi(): sagitta.walkeri;
+        pruinosus(): trivirgatus.falconeri;
+        delator(): netscheri<dogramacii.kaiseri, lavali.lepturus>;
+        nyikae(): trivirgatus.tumidifrons<howi.angulatus<howi.coludo<quasiater.carolinensis, minutus.portoricensis>, petrophilus.minutilla>, julianae.acariensis>;
+        ruemmleri(): panglima.amphibius<minutus.inez<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, dogramacii.aurata>, imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>>;
     }
 }
 declare module ruatanica {
-    class Praseodymium<T0, T1> extends hector<punicus, amicus> {
-        clara(): amphibius<ciliolabrum<carolinensis, beisa>, dauricus<americanus, caniventer>>;
-        spectabilis(): sodyi<caniventer, carolinensis>;
-        kamensis(): lotor<linulus<kaiseri, portoricensis>, lepturus>;
-        ruddi(): foina;
-        bartelsii(): sumatrana;
-        yerbabuenae(): siberu<lasiurus<foina, melanops>, ciliolabrum<megalonyx, minutilla>>;
-        davidi(): mixtus<melanoleuca, stolzmanni>;
-        pilirostris(): wetmorei<lasiurus<amphibius<uralensis, klossii<nudicaudus, aurata>>, leptoceros<punicus, arboreus<carolinensis, caniventer>>>, konganensis>;
-        catherinae(): lasiurus<nitidus<marcanoi, daphaenodon>, sodyi<konganensis, psilurus>>;
-        frontata(): oreas;
-        Terbium(): mahaganus<galapagoensis, luctuosa>;
-        thomensis(): inez<oreas, albidens<luctuosa, echinatus>>;
-        soricinus(): carolinensis;
+    class Praseodymium<T0, T1> extends hector<lutreolus.punicus, gabriellae.amicus> {
+        clara(): panglima.amphibius<imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>, argurus.dauricus<americanus, rionegrensis.caniventer>>;
+        spectabilis(): petrophilus.sodyi<rionegrensis.caniventer, quasiater.carolinensis>;
+        kamensis(): trivirgatus.lotor<panamensis.linulus<dogramacii.kaiseri, minutus.portoricensis>, lavali.lepturus>;
+        ruddi(): lutreolus.foina;
+        bartelsii(): julianae.sumatrana;
+        yerbabuenae(): dammermani.siberu<imperfecta.lasiurus<lutreolus.foina, dammermani.melanops>, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>;
+        davidi(): trivirgatus.mixtus<provocax.melanoleuca, sagitta.stolzmanni>;
+        pilirostris(): argurus.wetmorei<imperfecta.lasiurus<panglima.amphibius<patas.uralensis, gabriellae.klossii<julianae.nudicaudus, dogramacii.aurata>>, sagitta.leptoceros<lutreolus.punicus, daubentonii.arboreus<quasiater.carolinensis, rionegrensis.caniventer>>>, macrorhinos.konganensis>;
+        catherinae(): imperfecta.lasiurus<Lanthanum.nitidus<howi.marcanoi, macrorhinos.daphaenodon>, petrophilus.sodyi<macrorhinos.konganensis, caurinus.psilurus>>;
+        frontata(): argurus.oreas;
+        Terbium(): caurinus.mahaganus<julianae.galapagoensis, argurus.luctuosa>;
+        thomensis(): minutus.inez<argurus.oreas, julianae.albidens<argurus.luctuosa, gabriellae.echinatus>>;
+        soricinus(): quasiater.carolinensis;
     }
 }
 declare module caurinus {
-    class johorensis<T0, T1> extends punicus {
-        maini(): Praseodymium<thaeleri, acariensis>;
+    class johorensis<T0, T1> extends lutreolus.punicus {
+        maini(): ruatanica.Praseodymium<lavali.thaeleri, julianae.acariensis>;
     }
 }
 declare module argurus {
     class luctuosa {
-        loriae(): moojeni<marmosurus<moojeni<amphibius<falconeri, psilurus>, echinatus>, stolzmanni>, punicus>;
+        loriae(): rendalli.moojeni<macrorhinos.marmosurus<rendalli.moojeni<panglima.amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>, lutreolus.punicus>;
     }
 }
 declare module panamensis {
     class setulosus<T0, T1> {
-        duthieae(): mahaganus<coludo<oreas, marcanoi>, aurata>;
-        guereza(): coludo<stolzmanni, carolinensis>;
-        buselaphus(): nesiotes<lotor<abidi<lepturus, psilurus>, koepckeae>, mixtus<amicus, punicus>>;
-        nuttalli(): cinereus<netscheri<luctuosa, nudicaudus>, sarasinorum<megaphyllus, xanthognathus>>;
-        pelii(): crenulata<nitidus<caniventer, jugularis>, steerii>;
-        tunneyi(): stolzmanni;
-        lamula(): uralensis;
-        vampyrus(): oralis<foina, melanoleuca>;
+        duthieae(): caurinus.mahaganus<howi.coludo<argurus.oreas, howi.marcanoi>, dogramacii.aurata>;
+        guereza(): howi.coludo<sagitta.stolzmanni, quasiater.carolinensis>;
+        buselaphus(): daubentonii.nesiotes<trivirgatus.lotor<panglima.abidi<lavali.lepturus, caurinus.psilurus>, dogramacii.koepckeae>, trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus>>;
+        nuttalli(): sagitta.cinereus<argurus.netscheri<argurus.luctuosa, julianae.nudicaudus>, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>;
+        pelii(): rendalli.crenulata<Lanthanum.nitidus<rionegrensis.caniventer, Lanthanum.jugularis>, julianae.steerii>;
+        tunneyi(): sagitta.stolzmanni;
+        lamula(): patas.uralensis;
+        vampyrus(): julianae.oralis<lutreolus.foina, provocax.melanoleuca>;
     }
 }
 declare module petrophilus {
     class rosalia<T0, T1> {
-        palmeri(): amphibius<coludo<daphaenodon, amphibius<daphaenodon, uralensis>>, mixtus<dauricus<aurata, melanops>, amphibius<lepturus, carolinensis>>>;
-        baeops(): nitidus<thaeleri, lepturus>;
-        ozensis(): lasiurus<fundatus<amicus, foina>, foina>;
-        creaghi(): luctuosa;
-        montivaga(): setulosus<beisa, linulus<megaphyllus, megaphyllus>>;
+        palmeri(): panglima.amphibius<howi.coludo<macrorhinos.daphaenodon, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>, trivirgatus.mixtus<argurus.dauricus<dogramacii.aurata, dammermani.melanops>, panglima.amphibius<lavali.lepturus, quasiater.carolinensis>>>;
+        baeops(): Lanthanum.nitidus<lavali.thaeleri, lavali.lepturus>;
+        ozensis(): imperfecta.lasiurus<panglima.fundatus<gabriellae.amicus, lutreolus.foina>, lutreolus.foina>;
+        creaghi(): argurus.luctuosa;
+        montivaga(): panamensis.setulosus<lavali.beisa, panamensis.linulus<caurinus.megaphyllus, caurinus.megaphyllus>>;
     }
 }
 declare module caurinus {
-    class psilurus extends punicus {
-        socialis(): amphibius<falconeri, psilurus>;
-        lundi(): sodyi<falconeri, bobrinskoi>;
-        araeum(): ciliolabrum<carolinensis, beisa>;
-        calamianensis(): gerbillus<thaeleri, carolinensis>;
-        petersoni(): setulosus<walkeri, robustulus>;
-        nitela(): linulus<megalonyx, marcanoi>;
+    class psilurus extends lutreolus.punicus {
+        socialis(): panglima.amphibius<trivirgatus.falconeri, psilurus>;
+        lundi(): petrophilus.sodyi<trivirgatus.falconeri, quasiater.bobrinskoi>;
+        araeum(): imperfecta.ciliolabrum<quasiater.carolinensis, lavali.beisa>;
+        calamianensis(): julianae.gerbillus<lavali.thaeleri, quasiater.carolinensis>;
+        petersoni(): panamensis.setulosus<sagitta.walkeri, dogramacii.robustulus>;
+        nitela(): panamensis.linulus<Lanthanum.megalonyx, howi.marcanoi>;
     }
 }

From d8f3481d3874bf36bdd45be9b0adee29750f0922 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 15 Jul 2014 12:53:37 -0700
Subject: [PATCH 02/13] Check if there is alias symbol in the scope
 corresponding to the symbol whose name we are trying to get in the symbol
 table

---
 src/compiler/checker.ts                       | 57 +++++++++++--------
 ...tExternalModuleWithSingleExportedModule.js |  2 +-
 ...lFileExportAssignmentOfGenericInterface.js |  2 +-
 ...eclFileImportModuleWithExportAssignment.js |  6 +-
 ...eclFileImportedTypeUseInTypeArgPosition.js |  2 +-
 .../reference/declFileInternalAliases.js      |  4 +-
 .../importDeclarationUsedAsTypeQuery.js       |  2 +-
 .../baselines/reference/internalAliasClass.js |  2 +-
 ...alAliasClassInsideLocalModuleWithExport.js |  2 +-
 ...liasClassInsideLocalModuleWithoutExport.js |  2 +-
 ...liasClassInsideTopLevelModuleWithExport.js |  2 +-
 ...sClassInsideTopLevelModuleWithoutExport.js |  2 +-
 .../baselines/reference/internalAliasEnum.js  |  2 +-
 ...nalAliasEnumInsideLocalModuleWithExport.js |  2 +-
 ...AliasEnumInsideLocalModuleWithoutExport.js |  2 +-
 ...AliasEnumInsideTopLevelModuleWithExport.js |  2 +-
 ...asEnumInsideTopLevelModuleWithoutExport.js |  2 +-
 .../internalAliasInitializedModule.js         |  2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |  2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |  2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |  2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |  2 +-
 .../reference/internalAliasInterface.js       |  2 +-
 ...iasInterfaceInsideLocalModuleWithExport.js |  2 +-
 ...InterfaceInsideLocalModuleWithoutExport.js |  2 +-
 ...InterfaceInsideTopLevelModuleWithExport.js |  2 +-
 ...erfaceInsideTopLevelModuleWithoutExport.js |  2 +-
 .../internalAliasUninitializedModule.js       |  2 +-
 ...alizedModuleInsideLocalModuleWithExport.js |  2 +-
 ...zedModuleInsideLocalModuleWithoutExport.js |  2 +-
 ...zedModuleInsideTopLevelModuleWithExport.js |  2 +-
 ...ModuleInsideTopLevelModuleWithoutExport.js |  2 +-
 .../missingImportAfterModuleImport.js         |  2 +-
 .../amd/useModule.d.ts                        |  4 +-
 .../node/useModule.d.ts                       |  4 +-
 .../amd/useModule.d.ts                        |  6 +-
 .../node/useModule.d.ts                       |  6 +-
 .../amd/useModule.d.ts                        |  2 +-
 .../node/useModule.d.ts                       |  2 +-
 .../amd/useModule.d.ts                        | 18 +++---
 .../node/useModule.d.ts                       | 18 +++---
 .../amd/m5.d.ts                               |  2 +-
 .../amd/useModule.d.ts                        | 14 ++---
 .../node/m5.d.ts                              |  2 +-
 .../node/useModule.d.ts                       | 14 ++---
 .../amd/useModule.d.ts                        | 12 ++--
 .../node/useModule.d.ts                       | 12 ++--
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outModuleSimpleNoOutdir/amd/test.d.ts     |  2 +-
 .../outModuleSimpleNoOutdir/node/test.d.ts    |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../outModuleSubfolderNoOutdir/amd/test.d.ts  |  2 +-
 .../outModuleSubfolderNoOutdir/node/test.d.ts |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../outputdir_module_multifolder/test.d.ts    |  4 +-
 .../amd/test.d.ts                             |  4 +-
 .../node/test.d.ts                            |  4 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 .../amd/outdir/simple/test.d.ts               |  2 +-
 .../node/outdir/simple/test.d.ts              |  2 +-
 .../amd/test.d.ts                             |  2 +-
 .../node/test.d.ts                            |  2 +-
 209 files changed, 342 insertions(+), 333 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index cdf2c5aa01a..444cd39c8bb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -586,22 +586,30 @@ module ts {
             return (propertySymbol.valueDeclaration.flags & NodeFlags.QuestionMark) && propertySymbol.valueDeclaration.kind !== SyntaxKind.Parameter;
         }
 
-        function isSymbolAccessible(symbol: Symbol, enclosingDeclaration: Node) {
-            function containsSymbol(symbols: SymbolTable) {
-                if (hasProperty(symbols, symbol.name)) {
-                    var symbolFromSymbolTable = symbols[symbol.name];
-                    if (symbol === symbolFromSymbolTable) {
-                        return true;
-                    }
-                    // TODO check if symbolFromSymbolTable is alias : and work appropriately if (symbolFromSymbolTable.flags & SymbolFlags.Import)
+        function getAccessibleSymbol(symbol: Symbol, enclosingDeclaration: Node) {
+            function getAccessibleSymbolFromSymbolTable(symbols: SymbolTable) {
+                // If symbol is directly available by its name in the symbol table
+                if (symbol === symbols[symbol.name]) {
+                    return symbol;
                 }
+
+                // Check if symbol is any of the alias
+                return forEachValue(symbols, symbolFromSymbolTable => {
+                    if (symbolFromSymbolTable.flags & SymbolFlags.Import) {
+                        var resolvedImportSymbol = resolveImport(symbolFromSymbolTable);
+                        if (resolvedImportSymbol === symbol) {
+                            return symbolFromSymbolTable;
+                        }
+                    }
+                });
            }
 
+            var accessibleSymbol: Symbol;
             while (enclosingDeclaration) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (enclosingDeclaration.locals && (enclosingDeclaration.kind !== SyntaxKind.SourceFile || enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
-                    if (containsSymbol(enclosingDeclaration.locals)) {
-                        return true;
+                    if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(enclosingDeclaration.locals)) {
+                        return accessibleSymbol;
                     }
                 }
                 switch (enclosingDeclaration.kind) {
@@ -610,21 +618,21 @@ module ts {
                             break;
                         }
                     case SyntaxKind.ModuleDeclaration:
-                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).exports)) {
-                            return true;
+                        if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(getSymbolOfNode(enclosingDeclaration).exports)) {
+                            return accessibleSymbol;
                         }
                         break;
                     case SyntaxKind.ClassDeclaration:
                     case SyntaxKind.InterfaceDeclaration:
-                        if (containsSymbol(getSymbolOfNode(enclosingDeclaration).members)) {
-                            return true;
+                        if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(getSymbolOfNode(enclosingDeclaration).members)) {
+                            return accessibleSymbol;
                         }
                         break;
                 }
                 enclosingDeclaration = enclosingDeclaration.parent;
             }
 
-            return containsSymbol(globals);
+            return getAccessibleSymbolFromSymbolTable(globals);
         }
 
         function symbolToString(symbol: Symbol, enclosingDeclaration?: Node) {
@@ -639,21 +647,22 @@ module ts {
             }
 
             // Get qualified name 
-            var symbolName = getSymbolName(symbol);
             if (enclosingDeclaration &&
                 !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
-                // TODO if !symbol.parent it could be in globals or it is non exported
-                if (!isSymbolAccessible(symbol, enclosingDeclaration)) {
-                    for (var parent = symbol.parent; parent; parent = parent.parent) {
-                        symbolName = getSymbolName(parent) + "." + symbolName;
-                        if (isSymbolAccessible(parent, enclosingDeclaration)) {
-                            break;
-                        }
+                var symbolName: string;
+                while (symbol) { 
+                    var accessibleParent = getAccessibleSymbol(symbol, enclosingDeclaration);
+                    symbolName = getSymbolName(accessibleParent || symbol) + (symbolName ? ("." + symbolName) : "");
+                    if (accessibleParent) {
+                        break;
                     }
+                    symbol = symbol.parent;
                 }
+
+                return symbolName;
             }
 
-            return symbolName
+            return getSymbolName(symbol);
         }
 
         function createSingleLineTextWriter() {
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
index 60ff82b671a..3c4ddf366f1 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.js
@@ -32,4 +32,4 @@ declare module "SubModule" {
 }
 //// [declFileAmbientExternalModuleWithSingleExportedModule_1.d.ts]
 /// <reference path='declFileAmbientExternalModuleWithSingleExportedModule_0.d.ts' />
-export declare var x: "SubModule".m.m3.c;
+export declare var x: SubModule.m.m3.c;
diff --git a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
index c13afd51c38..5f353ffd987 100644
--- a/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
+++ b/tests/baselines/reference/declFileExportAssignmentOfGenericInterface.js
@@ -28,4 +28,4 @@ interface Foo<T> {
 }
 export = Foo;
 //// [declFileExportAssignmentOfGenericInterface_1.d.ts]
-export declare var x: Foo<Foo<string>>;
+export declare var x: a<a<string>>;
diff --git a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
index 75d8d3e5840..ccea841ab47 100644
--- a/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
+++ b/tests/baselines/reference/declFileImportModuleWithExportAssignment.js
@@ -53,7 +53,7 @@ declare var m2: {
 export = m2;
 //// [declFileImportModuleWithExportAssignment_1.d.ts]
 export declare var a: {
-    (): m2.connectExport;
-    test1: m2.connectModule;
-    test2(): m2.connectModule;
+    (): a1.connectExport;
+    test1: a1.connectModule;
+    test2(): a1.connectModule;
 };
diff --git a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
index cd7f462a5ee..8d1e4cd4b2e 100644
--- a/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
+++ b/tests/baselines/reference/declFileImportedTypeUseInTypeArgPosition.js
@@ -27,5 +27,5 @@ declare class List<T> {
 declare module 'mod1' {
 }
 declare module 'moo' {
-    var p: List<'mod1'.Foo>;
+    var p: List<x.Foo>;
 }
diff --git a/tests/baselines/reference/declFileInternalAliases.js b/tests/baselines/reference/declFileInternalAliases.js
index f41a2e7db6a..5ae14f41487 100644
--- a/tests/baselines/reference/declFileInternalAliases.js
+++ b/tests/baselines/reference/declFileInternalAliases.js
@@ -40,9 +40,9 @@ declare module m {
     }
 }
 declare module m1 {
-    var d: m.c;
+    var d: x;
 }
 declare module m2 {
     export import x = m.c;
-    var d: m.c;
+    var d: x;
 }
diff --git a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
index dff2977ce6c..30493dc8ccf 100644
--- a/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
+++ b/tests/baselines/reference/importDeclarationUsedAsTypeQuery.js
@@ -28,4 +28,4 @@ export declare class B {
 }
 //// [importDeclarationUsedAsTypeQuery_1.d.ts]
 /// <reference path='importDeclarationUsedAsTypeQuery_require.d.ts' />
-export declare var x: typeof "tests/cases/compiler/importDeclarationUsedAsTypeQuery_require";
+export declare var x: typeof a;
diff --git a/tests/baselines/reference/internalAliasClass.js b/tests/baselines/reference/internalAliasClass.js
index 4d1958d9e69..a116df0e2d4 100644
--- a/tests/baselines/reference/internalAliasClass.js
+++ b/tests/baselines/reference/internalAliasClass.js
@@ -32,5 +32,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: a.c;
+    var x: b;
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
index d48b5cf1979..811585cbf4f 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithExport.js
@@ -51,7 +51,7 @@ export declare module x {
 export declare module m2 {
     module m3 {
         export import c = x.c;
-        var cProp: x.c;
+        var cProp: c;
     }
 }
 export declare var d: x.c;
diff --git a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
index 8043f68d5f5..795ff99e0cc 100644
--- a/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideLocalModuleWithoutExport.js
@@ -47,6 +47,6 @@ export declare module x {
 }
 export declare module m2 {
     module m3 {
-        var cProp: x.c;
+        var cProp: c;
     }
 }
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
index cd27e8e71e7..eea66559139 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithExport.js
@@ -36,4 +36,4 @@ export declare module x {
     }
 }
 export import xc = x.c;
-export declare var cProp: x.c;
+export declare var cProp: xc;
diff --git a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
index e21579a25bf..9402269ce2e 100644
--- a/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasClassInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module x {
         foo(a: number): number;
     }
 }
-export declare var cProp: x.c;
+export declare var cProp: xc;
diff --git a/tests/baselines/reference/internalAliasEnum.js b/tests/baselines/reference/internalAliasEnum.js
index aab43af8aa6..f102762fa0e 100644
--- a/tests/baselines/reference/internalAliasEnum.js
+++ b/tests/baselines/reference/internalAliasEnum.js
@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var bVal: a.weekend;
+    var bVal: b;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
index 514273bc610..56cac6ad16d 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithExport.js
@@ -40,5 +40,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.weekend;
-    var bVal: a.weekend;
+    var bVal: b;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
index 44355c86536..84984523f84 100644
--- a/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideLocalModuleWithoutExport.js
@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var bVal: a.weekend;
+    var bVal: b;
 }
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
index 91ab770cfc4..3ac848b7093 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithExport.js
@@ -36,4 +36,4 @@ export declare module a {
     }
 }
 export import b = a.weekend;
-export declare var bVal: a.weekend;
+export declare var bVal: b;
diff --git a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
index 21b53cd3c8a..cd53972b311 100644
--- a/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasEnumInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module a {
         Sunday = 2,
     }
 }
-export declare var bVal: a.weekend;
+export declare var bVal: b;
diff --git a/tests/baselines/reference/internalAliasInitializedModule.js b/tests/baselines/reference/internalAliasInitializedModule.js
index cb6d1d9e84a..c1d3a3c9f3c 100644
--- a/tests/baselines/reference/internalAliasInitializedModule.js
+++ b/tests/baselines/reference/internalAliasInitializedModule.js
@@ -39,5 +39,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: a.b.c;
+    var x: b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
index 463e25fb1c0..b39fd09a73c 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithExport.js
@@ -42,5 +42,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.b;
-    var x: a.b.c;
+    var x: b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
index ece1caf7300..f3290369223 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideLocalModuleWithoutExport.js
@@ -39,5 +39,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: a.b.c;
+    var x: b.c;
 }
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
index 2c840ebe4ea..919d1037922 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithExport.js
@@ -34,4 +34,4 @@ export declare module a {
     }
 }
 export import b = a.b;
-export declare var x: a.b.c;
+export declare var x: b.c;
diff --git a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
index 843a653ae3a..308d792bf39 100644
--- a/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -35,4 +35,4 @@ export declare module a {
         }
     }
 }
-export declare var x: a.b.c;
+export declare var x: b.c;
diff --git a/tests/baselines/reference/internalAliasInterface.js b/tests/baselines/reference/internalAliasInterface.js
index 911f8c78175..1be40a65ea0 100644
--- a/tests/baselines/reference/internalAliasInterface.js
+++ b/tests/baselines/reference/internalAliasInterface.js
@@ -23,5 +23,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: a.I;
+    var x: b;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
index b039ac30bdb..0b8181b88e2 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithExport.js
@@ -26,5 +26,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.I;
-    var x: a.I;
+    var x: b;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
index 3ce012660eb..41e9a3dbc8c 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideLocalModuleWithoutExport.js
@@ -25,5 +25,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: a.I;
+    var x: b;
 }
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
index 2b3b2108383..a771da2d789 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithExport.js
@@ -18,4 +18,4 @@ export declare module a {
     }
 }
 export import b = a.I;
-export declare var x: a.I;
+export declare var x: b;
diff --git a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
index b029e4e31b6..cc9d21805d8 100644
--- a/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasInterfaceInsideTopLevelModuleWithoutExport.js
@@ -19,4 +19,4 @@ export declare module a {
     interface I {
     }
 }
-export declare var x: a.I;
+export declare var x: b;
diff --git a/tests/baselines/reference/internalAliasUninitializedModule.js b/tests/baselines/reference/internalAliasUninitializedModule.js
index 1b361802a1b..509d3711f5a 100644
--- a/tests/baselines/reference/internalAliasUninitializedModule.js
+++ b/tests/baselines/reference/internalAliasUninitializedModule.js
@@ -30,5 +30,5 @@ declare module a {
     }
 }
 declare module c {
-    var x: a.b.I;
+    var x: b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
index 8ad67cdca5c..c3a6173cb04 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithExport.js
@@ -31,5 +31,5 @@ export declare module a {
 }
 export declare module c {
     export import b = a.b;
-    var x: a.b.I;
+    var x: b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
index f8d5fc51aae..3b4c5d1bd0d 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideLocalModuleWithoutExport.js
@@ -30,5 +30,5 @@ export declare module a {
     }
 }
 export declare module c {
-    var x: a.b.I;
+    var x: b.I;
 }
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
index 0aec8a86917..79bc7c6c874 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithExport.js
@@ -28,4 +28,4 @@ export declare module a {
     }
 }
 export import b = a.b;
-export declare var x: a.b.I;
+export declare var x: b.I;
diff --git a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
index b586b557792..ff9249b8266 100644
--- a/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
+++ b/tests/baselines/reference/internalAliasUninitializedModuleInsideTopLevelModuleWithoutExport.js
@@ -25,4 +25,4 @@ export declare module a {
         }
     }
 }
-export declare var x: a.b.I;
+export declare var x: b.I;
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.js b/tests/baselines/reference/missingImportAfterModuleImport.js
index 70fb5372f87..1ab1376589c 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.js
+++ b/tests/baselines/reference/missingImportAfterModuleImport.js
@@ -45,7 +45,7 @@ declare module "SubModule" {
 //// [missingImportAfterModuleImport_1.d.ts]
 /// <reference path='missingImportAfterModuleImport_0.d.ts' />
 declare class MainModule {
-    SubModule: "SubModule".SubModule;
+    SubModule: SubModule;
     constructor();
 }
 export = MainModule;
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
index 5b6d77769cb..1ffac0d4931 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/amd/useModule.d.ts
@@ -1,8 +1,8 @@
 declare module "quotedm1" {
     class v {
-        c: "m4".d;
+        c: m4.d;
     }
 }
 declare module "quotedm2" {
-    var c: "quotedm1".v;
+    var c: m1.v;
 }
diff --git a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
index 5b6d77769cb..1ffac0d4931 100644
--- a/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsCascadingImports/node/useModule.d.ts
@@ -1,8 +1,8 @@
 declare module "quotedm1" {
     class v {
-        c: "m4".d;
+        c: m4.d;
     }
 }
 declare module "quotedm2" {
-    var c: "quotedm1".v;
+    var c: m1.v;
 }
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
index 9cdf2c9b10a..b3f3616bb50 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsGlobalImport/amd/useModule.d.ts
@@ -1,3 +1,3 @@
-export declare var useGlo_m4_x4: "glo_m4".d;
-export declare var useGlo_m4_d4: typeof "glo_m4".d;
-export declare var useGlo_m4_f4: "glo_m4".d;
+export declare var useGlo_m4_x4: glo_m4.d;
+export declare var useGlo_m4_d4: typeof glo_m4.d;
+export declare var useGlo_m4_f4: glo_m4.d;
diff --git a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
index 9cdf2c9b10a..b3f3616bb50 100644
--- a/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsGlobalImport/node/useModule.d.ts
@@ -1,3 +1,3 @@
-export declare var useGlo_m4_x4: "glo_m4".d;
-export declare var useGlo_m4_d4: typeof "glo_m4".d;
-export declare var useGlo_m4_f4: "glo_m4".d;
+export declare var useGlo_m4_x4: glo_m4.d;
+export declare var useGlo_m4_d4: typeof glo_m4.d;
+export declare var useGlo_m4_f4: glo_m4.d;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
index bb065c3f1db..65fe7458a3e 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/amd/useModule.d.ts
@@ -1 +1 @@
-export declare var useFncOnly_m4_f4: "fncOnly_m4".d;
+export declare var useFncOnly_m4_f4: fncOnly_m4.d;
diff --git a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
index bb065c3f1db..65fe7458a3e 100644
--- a/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsImportedUseInFunction/node/useModule.d.ts
@@ -1 +1 @@
-export declare var useFncOnly_m4_f4: "fncOnly_m4".d;
+export declare var useFncOnly_m4_f4: fncOnly_m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
index a81996fb0e0..492616037df 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/amd/useModule.d.ts
@@ -1,11 +1,11 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
-export declare var useMultiImport_m4_x4: "m4".d;
-export declare var useMultiImport_m4_d4: typeof "m4".d;
-export declare var useMultiImport_m4_f4: "m4".d;
+export declare var useMultiImport_m4_x4: m4.d;
+export declare var useMultiImport_m4_d4: typeof m4.d;
+export declare var useMultiImport_m4_f4: m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
index a81996fb0e0..492616037df 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesImport/node/useModule.d.ts
@@ -1,11 +1,11 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
-export declare var useMultiImport_m4_x4: "m4".d;
-export declare var useMultiImport_m4_d4: typeof "m4".d;
-export declare var useMultiImport_m4_f4: "m4".d;
+export declare var useMultiImport_m4_x4: m4.d;
+export declare var useMultiImport_m4_d4: typeof m4.d;
+export declare var useMultiImport_m4_f4: m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
index a05e54a4522..be50f5ad4a3 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/m5.d.ts
@@ -1 +1 @@
-export declare function foo2(): "m4".d;
+export declare function foo2(): m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
index 2f1f3af3259..e7c6ad2f836 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/amd/useModule.d.ts
@@ -1,9 +1,9 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
-export declare var d: "m4".d;
+export declare var d: m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
index a05e54a4522..be50f5ad4a3 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/m5.d.ts
@@ -1 +1 @@
-export declare function foo2(): "m4".d;
+export declare function foo2(): m4.d;
diff --git a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
index 2f1f3af3259..e7c6ad2f836 100644
--- a/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsMultipleTimesMultipleImport/node/useModule.d.ts
@@ -1,9 +1,9 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
-export declare var d: "m4".d;
+export declare var d: m4.d;
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
index 920ed75e453..664759ceeef 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/amd/useModule.d.ts
@@ -1,8 +1,8 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
diff --git a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
index 920ed75e453..664759ceeef 100644
--- a/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
+++ b/tests/baselines/reference/project/declarationsSimpleImport/node/useModule.d.ts
@@ -1,8 +1,8 @@
-export declare var x4: "m4".d;
-export declare var d4: typeof "m4".d;
-export declare var f4: "m4".d;
+export declare var x4: m4.d;
+export declare var d4: typeof m4.d;
+export declare var f4: m4.d;
 export declare module m1 {
-    var x2: "m4".d;
-    var d2: typeof "m4".d;
-    var f2: "m4".d;
+    var x2: m4.d;
+    var d2: typeof m4.d;
+    var f2: m4.d;
 }
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/mapRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/maprootUrlsourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/outModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootAbsolutePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourceRootRelativePathModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcemapModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderNoOutdir/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/amd/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
index 3192c54b9a3..6a5ff1574cf 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleMultifolderSpecifyOutputFile/node/test.d.ts
@@ -4,5 +4,5 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
-export declare var a3: typeof "../outputdir_module_multifolder_ref/m2".m2_c1;
+export declare var a2: typeof m1.m1_c1;
+export declare var a3: typeof m2.m2_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
index 8ea5ed86ea2..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSimpleSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderNoOutdir/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputDirectory/node/outdir/simple/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/amd/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;
diff --git a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
index d3670632f16..8535f388ae7 100644
--- a/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
+++ b/tests/baselines/reference/project/sourcerootUrlModuleSubfolderSpecifyOutputFile/node/test.d.ts
@@ -4,4 +4,4 @@ export declare class c1 {
 }
 export declare var instance1: c1;
 export declare function f1(): c1;
-export declare var a2: typeof "ref/m1".m1_c1;
+export declare var a2: typeof m1.m1_c1;

From 5a23dd06848f0e32316fb5f9279eb3cb618b3272 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Tue, 15 Jul 2014 16:03:25 -0700
Subject: [PATCH 03/13] Check if accessible symbol needs futher qualification

---
 src/compiler/checker.ts                       | 130 ++++++++++++------
 .../reference/declFileGenericType2.js         |   8 +-
 .../reference/declFileModuleContinuation.js   |   2 +-
 ...lictingWithClassReferredByExtendsClause.js |   2 +-
 ...rnalModuleNameConflictsInExtendsClause1.js |   2 +-
 ...rnalModuleNameConflictsInExtendsClause2.js |   2 +-
 ...rnalModuleNameConflictsInExtendsClause3.js |   2 +-
 .../declarationEmit_nameConflicts.errors.txt  |  53 -------
 .../declarationEmit_nameConflicts.js          |  72 +++++++++-
 .../declarationEmit_nameConflicts2.js         |   6 +-
 .../declarationEmit_nameConflicts3.js         |   2 +-
 ...tionEmit_nameConflictsWithAlias.errors.txt |  10 --
 .../declarationEmit_nameConflictsWithAlias.js |  15 ++
 .../compiler/declarationEmit_nameConflicts.ts |   3 +-
 .../declarationEmit_nameConflicts3.ts         |   1 +
 .../declarationEmit_nameConflictsWithAlias.ts |   1 +
 16 files changed, 190 insertions(+), 121 deletions(-)
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
 delete mode 100644 tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 444cd39c8bb..ab0b663bcfd 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -586,56 +586,102 @@ module ts {
             return (propertySymbol.valueDeclaration.flags & NodeFlags.QuestionMark) && propertySymbol.valueDeclaration.kind !== SyntaxKind.Parameter;
         }
 
-        function getAccessibleSymbol(symbol: Symbol, enclosingDeclaration: Node) {
+        function forEachSymbolTable<T>(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T {
+            var result: T;
+            for (var location = enclosingDeclaration; location; location = location.parent) {
+                // Locals of a source file are not in scope (because they get merged into the global symbol table)
+                if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) {
+                    if (result = callback(location.locals)) {
+                        return result;
+                    }
+                }
+                switch (location.kind) {
+                    case SyntaxKind.SourceFile:
+                        if (!(location.flags & NodeFlags.ExternalModule)) {
+                            break;
+                        }
+                    case SyntaxKind.ModuleDeclaration:
+                        if (result = callback(getSymbolOfNode(location).exports)) {
+                            return result;
+                        }
+                        break;
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.InterfaceDeclaration:
+                        if (result = callback(getSymbolOfNode(location).members)) {
+                            return result;
+                        }
+                        break;
+                }
+            }
+
+            return callback(globals);
+        }
+
+        function getAccessibleSymbol(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {
             function getAccessibleSymbolFromSymbolTable(symbols: SymbolTable) {
+                function isAccessible(symbolFromSymbolTable: Symbol, resolvedAliasSymbol?: Symbol) {
+                    if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
+                        // If the symbol is equivalent and doesnt need futher qualification, this symbol is accessible
+                        if (!needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning)) {
+                            return true;
+                        }
+
+                        // isAccessible is parent is accessible
+                        var accessibleParent = getAccessibleSymbol(symbolFromSymbolTable.parent, enclosingDeclaration, SymbolFlags.Namespace);
+                        return !!accessibleParent;
+                    }
+                }
+
                 // If symbol is directly available by its name in the symbol table
-                if (symbol === symbols[symbol.name]) {
+                if (isAccessible(symbols[symbol.name])) {
                     return symbol;
                 }
 
                 // Check if symbol is any of the alias
                 return forEachValue(symbols, symbolFromSymbolTable => {
                     if (symbolFromSymbolTable.flags & SymbolFlags.Import) {
-                        var resolvedImportSymbol = resolveImport(symbolFromSymbolTable);
-                        if (resolvedImportSymbol === symbol) {
+                        if (isAccessible(symbolFromSymbolTable, resolveImport(symbolFromSymbolTable))) {
                             return symbolFromSymbolTable;
                         }
                     }
                 });
-           }
-
-            var accessibleSymbol: Symbol;
-            while (enclosingDeclaration) {
-                // Locals of a source file are not in scope (because they get merged into the global symbol table)
-                if (enclosingDeclaration.locals && (enclosingDeclaration.kind !== SyntaxKind.SourceFile || enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
-                    if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(enclosingDeclaration.locals)) {
-                        return accessibleSymbol;
-                    }
-                }
-                switch (enclosingDeclaration.kind) {
-                    case SyntaxKind.SourceFile:
-                        if (!(enclosingDeclaration.flags & NodeFlags.ExternalModule)) {
-                            break;
-                        }
-                    case SyntaxKind.ModuleDeclaration:
-                        if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(getSymbolOfNode(enclosingDeclaration).exports)) {
-                            return accessibleSymbol;
-                        }
-                        break;
-                    case SyntaxKind.ClassDeclaration:
-                    case SyntaxKind.InterfaceDeclaration:
-                        if (accessibleSymbol = getAccessibleSymbolFromSymbolTable(getSymbolOfNode(enclosingDeclaration).members)) {
-                            return accessibleSymbol;
-                        }
-                        break;
-                }
-                enclosingDeclaration = enclosingDeclaration.parent;
             }
 
-            return getAccessibleSymbolFromSymbolTable(globals);
+            if (symbol) {
+                return forEachSymbolTable(enclosingDeclaration, getAccessibleSymbolFromSymbolTable);
+            }
         }
 
-        function symbolToString(symbol: Symbol, enclosingDeclaration?: Node) {
+        function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {
+            var qualify = false;
+            forEachSymbolTable(enclosingDeclaration, symbolTable => {
+                // If symbol of this name is not available in the symbol table we are ok
+                if (!symbolTable[symbol.name]) {
+                    // Continue to the next symbol table
+                    return false;
+                }
+                // If the symbol with this name is present it should refer to the symbol
+                var symbolFromSymbolTable = symbolTable[symbol.name];
+                if (symbolFromSymbolTable === symbol) {
+                    // No need to qualify
+                    return true;
+                }
+
+                // Qualify if the symbol from symbol table has same meaning as expected
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & SymbolFlags.Import) ? resolveImport(symbolFromSymbolTable) : symbolFromSymbolTable;
+                if (symbolFromSymbolTable.flags & meaning) {
+                    qualify = true;
+                    return true;
+                }
+
+                // Continue to the next symbol table
+                return false;
+            });
+
+            return qualify
+        }
+
+        function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) {
             function getSymbolName(symbol: Symbol) {
                 if (symbol.declarations && symbol.declarations.length > 0) {
                     var declaration = symbol.declarations[0];
@@ -651,12 +697,14 @@ module ts {
                 !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
                 var symbolName: string;
                 while (symbol) { 
-                    var accessibleParent = getAccessibleSymbol(symbol, enclosingDeclaration);
-                    symbolName = getSymbolName(accessibleParent || symbol) + (symbolName ? ("." + symbolName) : "");
-                    if (accessibleParent) {
+                    var isFirstName = !symbolName;
+                    var meaningToLook = isFirstName ? meaning : SymbolFlags.Namespace;
+                    var accessibleSymbol = getAccessibleSymbol(symbol, enclosingDeclaration, meaningToLook);
+                    symbolName = getSymbolName(accessibleSymbol || symbol) + (isFirstName ? "" : ("." + symbolName));
+                    if (accessibleSymbol && !needsQualification(accessibleSymbol, enclosingDeclaration, meaningToLook)) {
                         break;
                     }
-                    symbol = symbol.parent;
+                    symbol = accessibleSymbol ? accessibleSymbol.parent : symbol.parent;
                 }
 
                 return symbolName;
@@ -695,7 +743,7 @@ module ts {
                     writeTypeReference(<TypeReference>type);
                 }
                 else if (type.flags & (TypeFlags.Class | TypeFlags.Interface | TypeFlags.Enum | TypeFlags.TypeParameter)) {
-                    writer.write(symbolToString(type.symbol, enclosingDeclaration));
+                    writer.write(symbolToString(type.symbol, enclosingDeclaration, SymbolFlags.Type));
                 }
                 else if (type.flags & TypeFlags.Anonymous) {
                     writeAnonymousType(<ObjectType>type, allowFunctionOrConstructorTypeLiteral);
@@ -717,7 +765,7 @@ module ts {
                     writer.write("[]");
                 }
                 else {
-                    writer.write(symbolToString(type.target.symbol, enclosingDeclaration));
+                    writer.write(symbolToString(type.target.symbol, enclosingDeclaration, SymbolFlags.Type));
                     writer.write("<");
                     for (var i = 0; i < type.typeArguments.length; i++) {
                         if (i > 0) {
@@ -751,7 +799,7 @@ module ts {
 
             function writeTypeofSymbol(type: ObjectType) {
                 writer.write("typeof ");
-                writer.write(symbolToString(type.symbol, enclosingDeclaration));
+                writer.write(symbolToString(type.symbol, enclosingDeclaration, SymbolFlags.Value));
             }
 
             function writeLiteralType(type: ObjectType, allowFunctionOrConstructorTypeLiteral: boolean) {
diff --git a/tests/baselines/reference/declFileGenericType2.js b/tests/baselines/reference/declFileGenericType2.js
index ef8ee547913..94cdaa32eaa 100644
--- a/tests/baselines/reference/declFileGenericType2.js
+++ b/tests/baselines/reference/declFileGenericType2.js
@@ -99,17 +99,17 @@ declare module templa.mvc {
 declare module templa.mvc.composite {
 }
 declare module templa.dom.mvc {
-    interface IElementController<ModelType extends mvc.IModel> extends mvc.IController<ModelType> {
+    interface IElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.IController<ModelType> {
     }
 }
 declare module templa.dom.mvc {
-    class AbstractElementController<ModelType extends mvc.IModel> extends mvc.AbstractController<ModelType> implments IElementController<ModelType> {
+    class AbstractElementController<ModelType extends templa.mvc.IModel> extends templa.mvc.AbstractController<ModelType> implments IElementController<ModelType> {
         constructor();
     }
 }
 declare module templa.dom.mvc.composite {
-    class AbstractCompositeElementController<ModelType extends mvc.composite.ICompositeControllerModel> extends AbstractElementController<ModelType> {
-        _controllers: mvc.IController<mvc.IModel>[];
+    class AbstractCompositeElementController<ModelType extends templa.mvc.composite.ICompositeControllerModel> extends AbstractElementController<ModelType> {
+        _controllers: templa.mvc.IController<templa.mvc.IModel>[];
         constructor();
     }
 }
diff --git a/tests/baselines/reference/declFileModuleContinuation.js b/tests/baselines/reference/declFileModuleContinuation.js
index 88acd267fbf..490d599a2d9 100644
--- a/tests/baselines/reference/declFileModuleContinuation.js
+++ b/tests/baselines/reference/declFileModuleContinuation.js
@@ -33,6 +33,6 @@ declare module A.C {
     }
 }
 declare module A.B.C {
-    class W implments C.Z {
+    class W implments A.C.Z {
     }
 }
diff --git a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
index 72895c41a8f..ed695e40400 100644
--- a/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
+++ b/tests/baselines/reference/declFileWithClassNameConflictingWithClassReferredByExtendsClause.js
@@ -78,7 +78,7 @@ declare module X.Y.base {
     }
 }
 declare module X.Y.base.Z {
-    class W<TValue> extends W {
+    class W<TValue> extends base.W {
         value: boolean;
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
index dd3f70dd5d1..98f3c1df276 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause1.js
@@ -38,6 +38,6 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments C.Z {
+    class W implments X.A.C.Z {
     }
 }
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
index 786a8f897bc..6646ef907d1 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause2.js
@@ -41,7 +41,7 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments C.Z {
+    class W implments A.C.Z {
     }
 }
 declare module X.A.B.C {
diff --git a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
index 3cd54743c50..ca74a916fa8 100644
--- a/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
+++ b/tests/baselines/reference/declFileWithInternalModuleNameConflictsInExtendsClause3.js
@@ -41,7 +41,7 @@ declare module X.A.C {
     }
 }
 declare module X.A.B.C {
-    class W implments C.Z {
+    class W implments X.A.C.Z {
     }
 }
 declare module X.A.B.C {
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt b/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
deleted file mode 100644
index 6a202ec3e60..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflicts.errors.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-==== tests/cases/compiler/declarationEmit_nameConflicts_0.ts (1 errors) ====
-    import im = require('declarationEmit_nameConflicts_1');
-    export module M {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-    
-        export import a = M.f;
-        export import b = M.C;
-        export import c = N;
-        export import d = im;
-        ~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot find name 'im'.
-    }
-    
-    export module M.P {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-        export import im = M.P.f;
-        // Bug 887180: Invalid .d.ts when an aliased entity is referenced, and a different entity is closer in scope
-        export var a = M.a; // emitted incorrectly as typeof f
-        export var b = M.b; // ok
-        export var c = M.c; // ok
-        export var g = M.c.g; // ok
-        export var d = M.d; // emitted incorrectly as typeof im
-    }
-    
-    export module M.Q {
-        export function f() { }
-        export class C { }
-        export module N {
-            export function g() { };
-            export interface I { }
-        }
-        export interface b extends M.b { } // ok
-        export interface I extends M.c.I { } // ok
-        export module c {
-            export interface I extends M.c.I { } // ok
-        }
-    }
-==== tests/cases/compiler/declarationEmit_nameConflicts_1.ts (1 errors) ====
-    function f() { }
-    export = f;
-    ~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts.js b/tests/baselines/reference/declarationEmit_nameConflicts.js
index 1f9b13b7df6..7fc044a8aa9 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts.js
@@ -1,7 +1,7 @@
 //// [tests/cases/compiler/declarationEmit_nameConflicts.ts] ////
 
 //// [declarationEmit_nameConflicts_1.ts]
-function f() { }
+module f { export class c { } }
 export = f;
 
 //// [declarationEmit_nameConflicts_0.ts]
@@ -51,10 +51,18 @@ export module M.Q {
 }
 
 //// [declarationEmit_nameConflicts_1.js]
-function f() {
-}
+var f;
+(function (f) {
+    var c = (function () {
+        function c() {
+        }
+        return c;
+    })();
+    f.c = c;
+})(f || (f = {}));
 module.exports = f;
 //// [declarationEmit_nameConflicts_0.js]
+var im = require('declarationEmit_nameConflicts_1');
 (function (M) {
     function f() {
     }
@@ -75,6 +83,7 @@ module.exports = f;
     M.a = M.f;
     M.b = M.C;
     M.c = N;
+    M.d = im;
 })(exports.M || (exports.M = {}));
 var M = exports.M;
 (function (M) {
@@ -127,3 +136,60 @@ var M = exports.M;
     var Q = M.Q;
 })(exports.M || (exports.M = {}));
 var M = exports.M;
+
+
+//// [declarationEmit_nameConflicts_1.d.ts]
+declare module f {
+    class c {
+    }
+}
+export = f;
+//// [declarationEmit_nameConflicts_0.d.ts]
+export declare module M {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    export import a = M.f;
+    export import b = M.C;
+    export import c = N;
+    export import d = im;
+}
+export declare module M.P {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    export import im = M.P.f;
+    var a: () => void;
+    var b: typeof M.C;
+    var c: typeof M.N;
+    var g: () => void;
+    var d: typeof M.d;
+}
+export declare module M.Q {
+    function f(): void;
+    class C {
+    }
+    module N {
+        function g(): void;
+        interface I {
+        }
+    }
+    interface b extends M.C {
+    }
+    interface I extends M.N.I {
+    }
+    module c {
+        interface I extends M.N.I {
+        }
+    }
+}
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts2.js b/tests/baselines/reference/declarationEmit_nameConflicts2.js
index 7db130615a7..bc8ba2f63e9 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts2.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts2.js
@@ -73,7 +73,7 @@ declare module X.Y.base {
 }
 declare module X.Y.base.Z {
     var f: () => void;
-    var C: typeof C;
-    var M: typeof M;
-    var E: typeof E;
+    var C: typeof base.C;
+    var M: typeof base.M;
+    var E: typeof base.E;
 }
diff --git a/tests/baselines/reference/declarationEmit_nameConflicts3.js b/tests/baselines/reference/declarationEmit_nameConflicts3.js
index db5a7ba323b..cfec6264a77 100644
--- a/tests/baselines/reference/declarationEmit_nameConflicts3.js
+++ b/tests/baselines/reference/declarationEmit_nameConflicts3.js
@@ -110,7 +110,7 @@ declare module M.P {
     enum D {
         f = 0,
     }
-    var v: D;
+    var v: M.D;
     var w: () => void;
     var x: () => void;
     var x: () => void;
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
deleted file mode 100644
index 100bf85427e..00000000000
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-==== tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts (1 errors) ====
-    // Bug 887180
-    export module C { export interface I { } }
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
-    export import v = C;
-    export module M {
-        export module C { export interface I { } }
-        export var w: v.I; // Gets emitted as C.I, which is the wrong interface
-    }
\ No newline at end of file
diff --git a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
index eade0352272..72b2a9295f5 100644
--- a/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
+++ b/tests/baselines/reference/declarationEmit_nameConflictsWithAlias.js
@@ -12,3 +12,18 @@ export module M {
     M.w;
 })(exports.M || (exports.M = {}));
 var M = exports.M;
+
+
+//// [declarationEmit_nameConflictsWithAlias.d.ts]
+export declare module C {
+    interface I {
+    }
+}
+export import v = C;
+export declare module M {
+    module C {
+        interface I {
+        }
+    }
+    var w: v.I;
+}
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts.ts b/tests/cases/compiler/declarationEmit_nameConflicts.ts
index 40ae28d8c14..49218d2ef1e 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts.ts
@@ -1,6 +1,7 @@
 // @declaration: true
+// @module: commonjs
 // @Filename: declarationEmit_nameConflicts_1.ts
-function f() { }
+module f { export class c { } }
 export = f;
 
 // @Filename: declarationEmit_nameConflicts_0.ts
diff --git a/tests/cases/compiler/declarationEmit_nameConflicts3.ts b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
index 98f7ce91d5e..b854841b4b4 100644
--- a/tests/cases/compiler/declarationEmit_nameConflicts3.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflicts3.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @module: commonjs
 module M {
     export interface D { }
     export module D {
diff --git a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
index e6771f2d848..87cdca3fd41 100644
--- a/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
+++ b/tests/cases/compiler/declarationEmit_nameConflictsWithAlias.ts
@@ -1,4 +1,5 @@
 // @declaration: true
+// @module: commonjs
 // Bug 887180
 export module C { export interface I { } }
 export import v = C;

From 148abea09ded7be091d53eb055879ec97766ccc7 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 16 Jul 2014 11:37:49 -0700
Subject: [PATCH 04/13] Use the isDeclarationVisible in checker to determine if
 the declaration needs to be emitted This would help in unifying logic of when
 to check if the type is visible

---
 src/compiler/checker.ts                       | 139 +++++++++++++++---
 src/compiler/emitter.ts                       |  51 ++-----
 src/compiler/parser.ts                        |   6 -
 src/compiler/types.ts                         |   3 +-
 ...ileExportAssignmentImportInternalModule.js |  16 ++
 5 files changed, 151 insertions(+), 64 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index ab0b663bcfd..8e08f328d3b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -917,6 +917,125 @@ module ts {
             }
         }
 
+        function isDeclarationVisible(node: Declaration): boolean {
+            function isGlobalSourceFile(node: Node) {
+                return node.kind === SyntaxKind.SourceFile && !(node.flags & NodeFlags.ExternalModule);
+            }
+
+            function getExternalModule(node: Node) {
+                for (; node; node = node.parent) {
+                    if (node.kind === SyntaxKind.ModuleDeclaration) {
+                        if ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral) {
+                            return node;
+                        }
+                    }
+                    else if (node.kind === SyntaxKind.SourceFile) {
+                        return (node.flags & NodeFlags.ExternalModule) ? node : null;
+                    }
+                }
+            }
+
+            function isUsedInExportAssignment(node: Node) {
+                // Get source File and see if it is external module and has export assigned symbol
+                var externalModule = getExternalModule(node);
+                if (externalModule) {
+                    // This is export assigned symbol node
+                    var externalModuleSymbol = getSymbolOfNode(externalModule);
+                    var exportAssignmentSymbol = getExportAssignmentSymbol(externalModuleSymbol);
+                    var symbolOfNode = getSymbolOfNode(node);
+                    if (exportAssignmentSymbol === symbolOfNode) {
+                        return true;
+                    }
+
+                    if (exportAssignmentSymbol && !!(exportAssignmentSymbol.flags & SymbolFlags.Import)) {
+                        // if export assigned symbol is import declaration, resolve the import
+                        var resolvedExportSymbol = resolveImport(exportAssignmentSymbol);
+                        if (resolvedExportSymbol === symbolOfNode) {
+                            return true;
+                        }
+
+                        // TODO(shkamat): Chained import assignment
+                        // eg. a should be visible too.
+                        //module m {
+                        //    export module c {
+                        //        export class c {
+                        //        }
+                        //    }
+                        //}
+                        //import a = m.c;
+                        //import b = a;
+                        //export = b;
+
+                        // Container of resolvedExportSymbol is visible
+                        return forEach(resolvedExportSymbol.declarations, declaration => {
+                            while (declaration) {
+                                if (declaration === node) {
+                                    return true;
+                                }
+                                declaration = declaration.parent;
+                            }
+                        });
+                    }
+                }
+            }
+
+            function determineIfDeclarationIsVisible() {
+                switch (node.kind) {
+                    case SyntaxKind.VariableDeclaration:
+                        if (!(node.flags & NodeFlags.Export)) {
+                            // node.parent is variable statement so look at the variable statement's parent
+                            return isGlobalSourceFile(node.parent.parent) || isUsedInExportAssignment(node);
+                        }
+                        // Exported members are visible if parent is visible
+                        return isDeclarationVisible(node.parent.parent);
+
+                    case SyntaxKind.ModuleDeclaration:
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.InterfaceDeclaration:
+                    case SyntaxKind.FunctionDeclaration:
+                    case SyntaxKind.EnumDeclaration:
+                    case SyntaxKind.ImportDeclaration:
+                        if (!(node.flags & NodeFlags.Export)) {
+                            // TODO(shkamat): non exported aliases can be visible if they are referenced else where for value/type/namespace
+                            return isGlobalSourceFile(node.parent) || isUsedInExportAssignment(node);
+                        }
+                        // Exported members are visible if parent is visible
+                        return isDeclarationVisible(node.parent);
+
+                    case SyntaxKind.Property:
+                    case SyntaxKind.Method:
+                        if (node.flags & NodeFlags.Private) {
+                            // Private properties/methods are not visible
+                            return false;
+                        }
+                    // Public properties/methods are visible if its parents are visible, so let it fall into next case statement
+
+                    case SyntaxKind.Constructor:
+                    case SyntaxKind.ConstructSignature:
+                    case SyntaxKind.CallSignature:
+                    case SyntaxKind.IndexSignature:
+                    case SyntaxKind.Parameter:
+                    case SyntaxKind.ModuleBlock:
+                        return isDeclarationVisible(node.parent);
+
+                    // Source file is always visible
+                    case SyntaxKind.SourceFile:
+                        return true;
+
+                    default:
+                        Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + SyntaxKind[node.kind]);
+                }
+            }
+
+            if (node) {
+                var links = getNodeLinks(node);
+                if (links.isVisible === undefined) {
+                    links.isVisible = determineIfDeclarationIsVisible();
+                }
+                return links.isVisible;
+            }
+        }
+
         function getApparentType(type: Type): ApparentType {
             if (type.flags & TypeFlags.TypeParameter) {
                 do {
@@ -4892,7 +5011,7 @@ module ts {
                     checkTypeAssignableTo(checkAndMarkExpression(node.initializer, type), type, node, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined);
                 }
             }
-            
+
             checkCollisionWithCapturedSuperVariable(node, node.name);
             if (!useTypeFromValueDeclaration) {
                 // TypeScript 1.0 spec (April 2014): 5.1
@@ -5870,22 +5989,6 @@ module ts {
             return false;
         }
 
-        function isReferencedInExportAssignment(node: Declaration): boolean {
-            var exportAssignedSymbol = getExportAssignmentSymbol(getSymbolOfNode(getContainerOfModuleElementDeclaration(node)));
-            if (exportAssignedSymbol) {
-                var symbol = getSymbolOfNode(node);
-                if (exportAssignedSymbol === symbol) {
-                    // This symbol was export assigned symbol
-                    return true;
-                }
-
-                // TODO(shkamat): if export assignment is alias, the alias target would make the node as referenced in export assignment 
-                
-            }
-
-            return false;
-        }
-
         function isImplementationOfOverload(node: FunctionDeclaration) {
             if (node.body) {
                 var symbol = getSymbolOfNode(node);
@@ -5927,7 +6030,7 @@ module ts {
                 getEnumMemberValue: getEnumMemberValue,
                 isTopLevelValueImportedViaEntityName: isTopLevelValueImportedViaEntityName,
                 shouldEmitDeclarations: shouldEmitDeclarations,
-                isReferencedInExportAssignment: isReferencedInExportAssignment,
+                isDeclarationVisible: isDeclarationVisible,
                 isImplementationOfOverload: isImplementationOfOverload,
                 writeTypeAtLocation: writeTypeAtLocation,
                 writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 20999a77cd4..98fba811159 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -1881,34 +1881,6 @@ module ts {
             writeLine();
         }
 
-        function isModuleElementExternallyVisible(node: Declaration) {
-            if (node.flags & NodeFlags.Export) {
-                // Exported member - emit this declaration
-                return true;
-            }
-
-            // If this node is in external module, check if this is export assigned 
-            var moduleDeclaration = getContainerOfModuleElementDeclaration(node);
-            if ((moduleDeclaration.flags & NodeFlags.ExternalModule) || // Source file with external module flag
-                // Ambient external module declaration
-                (moduleDeclaration.kind === SyntaxKind.ModuleDeclaration && (<ModuleDeclaration>moduleDeclaration).name.kind === SyntaxKind.StringLiteral)) {
-                return resolver.isReferencedInExportAssignment(node);
-            }
-
-            return false;
-        }
-
-        function canEmitModuleElementDeclaration(node: Declaration) {
-            if (isModuleElementExternallyVisible(node)) {
-                // Either exported module element or is referenced in export assignment
-                return true;
-            }
-
-            // emit the declaration if this is in global scope source file
-            var moduleDeclaration = getContainerOfModuleElementDeclaration(node);
-            return moduleDeclaration.kind === SyntaxKind.SourceFile && !(moduleDeclaration.flags & NodeFlags.ExternalModule);
-        }
-
         function emitDeclarationFlags(node: Declaration) {
             if (node.flags & NodeFlags.Static) {
                 if (node.flags & NodeFlags.Private) {
@@ -1935,8 +1907,7 @@ module ts {
         }
 
         function emitImportDeclaration(node: ImportDeclaration) {
-            // TODO(shkamat): Emit if import decl is used to declare type in this context
-            if (isModuleElementExternallyVisible(node)) {
+            if (resolver.isDeclarationVisible(node)) {
                 if (node.flags & NodeFlags.Export) {
                     write("export ");
                 }
@@ -1957,7 +1928,7 @@ module ts {
         }
         
         function emitModuleDeclaration(node: ModuleDeclaration) {
-            if (canEmitModuleElementDeclaration(node)) {
+            if (resolver.isDeclarationVisible(node)) {
                 emitDeclarationFlags(node);
                 write("module ");
                 emitSourceTextOfNode(node.name);
@@ -1980,7 +1951,7 @@ module ts {
         }
 
         function emitEnumDeclaration(node: EnumDeclaration) {
-            if (canEmitModuleElementDeclaration(node)) {
+            if (resolver.isDeclarationVisible(node)) {
                 emitDeclarationFlags(node);
                 write("enum ");
                 emitSourceTextOfNode(node.name);
@@ -2043,7 +2014,7 @@ module ts {
                 }
             }
 
-            if (canEmitModuleElementDeclaration(node)) {
+            if (resolver.isDeclarationVisible(node)) {
                 emitDeclarationFlags(node);
                 write("class ");
                 emitSourceTextOfNode(node.name);
@@ -2067,7 +2038,7 @@ module ts {
         }
 
         function emitInterfaceDeclaration(node: InterfaceDeclaration) {
-            if (canEmitModuleElementDeclaration(node)) {
+            if (resolver.isDeclarationVisible(node)) {
                 emitDeclarationFlags(node);
                 write("interface ");
                 emitSourceTextOfNode(node.name);
@@ -2094,8 +2065,9 @@ module ts {
         }
 
         function emitVariableDeclaration(node: VariableDeclaration) {
-            // If we are emitting property it isnt moduleElement and doesnt need canEmitModuleElement check
-            if (node.kind !== SyntaxKind.VariableDeclaration || canEmitModuleElementDeclaration(node)) {
+            // If we are emitting property it isnt moduleElement and hence we already know it needs to be emitted
+            // so there is no check needed to see if declaration is visible
+            if (node.kind !== SyntaxKind.VariableDeclaration || resolver.isDeclarationVisible(node)) {
                 emitSourceTextOfNode(node.name);
                 // If optional property emit ?
                 if (node.kind === SyntaxKind.Property && (node.flags & NodeFlags.QuestionMark)) {
@@ -2109,7 +2081,7 @@ module ts {
         }
 
         function emitVariableStatement(node: VariableStatement) {
-            var hasDeclarationWithEmit = forEach(node.declarations, varDeclaration => canEmitModuleElementDeclaration(varDeclaration));
+            var hasDeclarationWithEmit = forEach(node.declarations, varDeclaration => resolver.isDeclarationVisible(varDeclaration));
             if (hasDeclarationWithEmit) {
                 emitDeclarationFlags(node);
                 write("var ");
@@ -2134,8 +2106,9 @@ module ts {
         }
 
         function emitFunctionDeclaration(node: FunctionDeclaration) {
-            // If we are emitting Method/Constructor it isnt moduleElement and doesnt need canEmitModuleElement check
-            if ((node.kind !== SyntaxKind.FunctionDeclaration || canEmitModuleElementDeclaration(node)) &&
+            // If we are emitting Method/Constructor it isnt moduleElement and hence already determined to be emitting
+            // so no need to verify if the declaration is visible
+            if ((node.kind !== SyntaxKind.FunctionDeclaration || resolver.isDeclarationVisible(node)) &&
                 !resolver.isImplementationOfOverload(node)) {
                 emitDeclarationFlags(node);
                 if (node.kind === SyntaxKind.FunctionDeclaration) {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index d3e942be2fe..e39d8ab3694 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -273,12 +273,6 @@ module ts {
         return s.parameters.length > 0 && (s.parameters[s.parameters.length - 1].flags & NodeFlags.Rest) !== 0;
     }
 
-    export function getContainerOfModuleElementDeclaration(node: Declaration) {
-        // If the declaration is var declaration, then the parent is variable statement but we actually want the module
-        var container = node.kind === SyntaxKind.VariableDeclaration ? node.parent.parent : node.parent;
-        return container.kind == SyntaxKind.ModuleBlock ? container.parent : container;
-    }
-
     enum ParsingContext {
         SourceElements,          // Elements in source file
         ModuleElements,          // Elements in module declaration
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index c63d5ef1242..f9068868850 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -616,7 +616,7 @@ module ts {
         getNodeCheckFlags(node: Node): NodeCheckFlags;
         getEnumMemberValue(node: EnumMember): number;
         shouldEmitDeclarations(): boolean;
-        isReferencedInExportAssignment(node: Declaration): boolean;
+        isDeclarationVisible(node: Declaration): boolean;
         isImplementationOfOverload(node: FunctionDeclaration): boolean;
         writeTypeAtLocation(location: Node, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void;
         writeReturnTypeOfSignatureDeclaration(signatureDeclaration: SignatureDeclaration, enclosingDeclaration: Node, flags: TypeFormatFlags, writer: TextWriter): void;
@@ -736,6 +736,7 @@ module ts {
         flags?: NodeCheckFlags;         // Set of flags specific to Node
         enumMemberValue?: number;       // Constant value of enum member
         isIllegalTypeReferenceInConstraint?: boolean; // Is type reference in constraint refers to the type parameter from the same list
+        isVisible?: boolean;            // Is this node visible 
     }
 
     export enum TypeFlags {
diff --git a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js
index 2ead0783eeb..f4cd27e6c01 100644
--- a/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js
+++ b/tests/baselines/reference/declFileExportAssignmentImportInternalModule.js
@@ -31,5 +31,21 @@ module.exports = m;
 
 
 //// [declFileExportAssignmentImportInternalModule.d.ts]
+declare module m3 {
+    module m2 {
+        interface connectModule {
+            (res: any, req: any, next: any): void;
+        }
+        interface connectExport {
+            use: (mod: connectModule) => connectExport;
+            listen: (port: number) => void;
+        }
+    }
+    var server: {
+        (): m2.connectExport;
+        test1: m2.connectModule;
+        test2(): m2.connectModule;
+    };
+}
 import m = m3;
 export = m;

From 1bb219a3ddc51a4d1c2f3260ccfc157cc7cce51e Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Wed, 16 Jul 2014 14:50:37 -0700
Subject: [PATCH 05/13] Incorporating code review feedback

---
 src/compiler/checker.ts | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8e08f328d3b..75d0211510c 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -181,6 +181,10 @@ module ts {
             return <SourceFile>getAncestor(node, SyntaxKind.SourceFile);
         }
 
+        function isGlobalSourceFile(node: Node) {
+            return node.kind === SyntaxKind.SourceFile && !(node.flags & NodeFlags.ExternalModule);
+        }
+
         function getSymbol(symbols: SymbolTable, name: string, meaning: SymbolFlags): Symbol {
             if (meaning && hasProperty(symbols, name)) {
                 var symbol = symbols[name];
@@ -226,7 +230,7 @@ module ts {
 
             while (location) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
-                if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) {
+                if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = getSymbol(location.locals, name, meaning)) {
                         return returnResolvedSymbol(result);
                     }
@@ -586,11 +590,11 @@ module ts {
             return (propertySymbol.valueDeclaration.flags & NodeFlags.QuestionMark) && propertySymbol.valueDeclaration.kind !== SyntaxKind.Parameter;
         }
 
-        function forEachSymbolTable<T>(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T {
+        function forEachSymbolTableInScope<T>(enclosingDeclaration: Node, callback: (symbolTable: SymbolTable) => T): T {
             var result: T;
             for (var location = enclosingDeclaration; location; location = location.parent) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
-                if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) {
+                if (location.locals && !isGlobalSourceFile(location)) {
                     if (result = callback(location.locals)) {
                         return result;
                     }
@@ -626,7 +630,7 @@ module ts {
                             return true;
                         }
 
-                        // isAccessible is parent is accessible
+                        // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too
                         var accessibleParent = getAccessibleSymbol(symbolFromSymbolTable.parent, enclosingDeclaration, SymbolFlags.Namespace);
                         return !!accessibleParent;
                     }
@@ -648,13 +652,13 @@ module ts {
             }
 
             if (symbol) {
-                return forEachSymbolTable(enclosingDeclaration, getAccessibleSymbolFromSymbolTable);
+                return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolFromSymbolTable);
             }
         }
 
         function needsQualification(symbol: Symbol, enclosingDeclaration: Node, meaning: SymbolFlags) {
             var qualify = false;
-            forEachSymbolTable(enclosingDeclaration, symbolTable => {
+            forEachSymbolTableInScope(enclosingDeclaration, symbolTable => {
                 // If symbol of this name is not available in the symbol table we are ok
                 if (!symbolTable[symbol.name]) {
                     // Continue to the next symbol table
@@ -681,6 +685,8 @@ module ts {
             return qualify
         }
 
+        // Enclosing declaration is optional when we dont want to get qualified name in the enclosing declaration scope
+        // Meaning needs to be specified if the enclosing declaration is given
         function symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags) {
             function getSymbolName(symbol: Symbol) {
                 if (symbol.declarations && symbol.declarations.length > 0) {
@@ -694,6 +700,7 @@ module ts {
 
             // Get qualified name 
             if (enclosingDeclaration &&
+                // Properties/methods/Signatures/Constructors/TypeParameters do not need qualification
                 !(symbol.flags & SymbolFlags.PropertyOrAccessor & SymbolFlags.Signature & SymbolFlags.Constructor & SymbolFlags.Method & SymbolFlags.TypeParameter)) {
                 var symbolName: string;
                 while (symbol) { 
@@ -918,11 +925,7 @@ module ts {
         }
 
         function isDeclarationVisible(node: Declaration): boolean {
-            function isGlobalSourceFile(node: Node) {
-                return node.kind === SyntaxKind.SourceFile && !(node.flags & NodeFlags.ExternalModule);
-            }
-
-            function getExternalModule(node: Node) {
+            function getContainingExternalModule(node: Node) {
                 for (; node; node = node.parent) {
                     if (node.kind === SyntaxKind.ModuleDeclaration) {
                         if ((<ModuleDeclaration>node).name.kind === SyntaxKind.StringLiteral) {
@@ -930,14 +933,15 @@ module ts {
                         }
                     }
                     else if (node.kind === SyntaxKind.SourceFile) {
-                        return (node.flags & NodeFlags.ExternalModule) ? node : null;
+                        return (node.flags & NodeFlags.ExternalModule) ? node : undefined;
                     }
                 }
+                Debug.fail("getContainingModule cant reach here");
             }
 
             function isUsedInExportAssignment(node: Node) {
                 // Get source File and see if it is external module and has export assigned symbol
-                var externalModule = getExternalModule(node);
+                var externalModule = getContainingExternalModule(node);
                 if (externalModule) {
                     // This is export assigned symbol node
                     var externalModuleSymbol = getSymbolOfNode(externalModule);
@@ -5513,7 +5517,7 @@ module ts {
         function checkModuleDeclaration(node: ModuleDeclaration) {
             checkDeclarationModifiers(node);
             if (node.name.kind === SyntaxKind.StringLiteral) {
-                if (node.parent.kind !== SyntaxKind.SourceFile || node.parent.flags & NodeFlags.ExternalModule) {
+                if (!isGlobalSourceFile(node.parent)) {
                     error(node, Diagnostics.Ambient_external_modules_cannot_be_nested_in_other_modules);
                 }
                 if (isExternalModuleNameRelative(node.name.text)) {
@@ -5755,7 +5759,7 @@ module ts {
                 }
             }
             while (location) {
-                if (location.locals && (location.kind !== SyntaxKind.SourceFile || location.flags & NodeFlags.ExternalModule)) {
+                if (location.locals && !isGlobalSourceFile(location)) {
                     copySymbols(location.locals, meaning);
                 }
                 switch (location.kind) {

From cece68098a61137095956eee5345a856ea2f8044 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 15 Jul 2014 14:24:44 -0700
Subject: [PATCH 06/13] Better error recovery when errant semicolon found in a
 class.

---
 src/compiler/parser.ts                        |  41 ++++---
 .../reference/ambientGetters.errors.txt       |   4 +-
 .../reference/es6ClassTest3.errors.txt        |  34 +-----
 .../reference/exportDeclareClass1.errors.txt  |  18 +--
 .../reference/parser0_004152.errors.txt       |  14 +--
 ...EqualsGreaterThanAfterFunction2.errors.txt |   4 +-
 .../parserErrantSemicolonInClass1.errors.txt  | 112 +-----------------
 .../parserMissingLambdaOpenBrace1.errors.txt  |   4 +-
 ...sWhenHittingUnexpectedSemicolon.errors.txt |   8 ++
 .../reference/primitiveMembers.errors.txt     |   6 +-
 ...sRecoversWhenHittingUnexpectedSemicolon.ts |   4 +
 11 files changed, 61 insertions(+), 188 deletions(-)
 create mode 100644 tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
 create mode 100644 tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index f690697cc5c..5de28b69de9 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -619,14 +619,14 @@ module ts {
         }
 
         // True if positioned at the start of a list element
-        function isListElement(kind: ParsingContext): boolean {
+        function isListElement(kind: ParsingContext, inErrorRecovery: boolean): boolean {
             switch (kind) {
                 case ParsingContext.SourceElements:
                 case ParsingContext.ModuleElements:
-                    return isSourceElement();
+                    return isSourceElement(inErrorRecovery);
                 case ParsingContext.BlockStatements:
                 case ParsingContext.SwitchClauseStatements:
-                    return isStatement();
+                    return isStatement(inErrorRecovery);
                 case ParsingContext.SwitchClauses:
                     return token === SyntaxKind.CaseKeyword || token === SyntaxKind.DefaultKeyword;
                 case ParsingContext.TypeMembers:
@@ -650,6 +650,8 @@ module ts {
                 case ParsingContext.TypeArguments:
                     return isType();
             }
+
+            Debug.fail("Non-exhaustive case in 'isListElement'.");
         }
 
         // True if positioned at a list terminator
@@ -717,10 +719,12 @@ module ts {
         }
 
         // True if positioned at element or terminator of the current list or any enclosing list
-        function isInParsingContext(): boolean {
+        function isInSomeParsingContext(): boolean {
             for (var kind = 0; kind < ParsingContext.Count; kind++) {
                 if (parsingContext & (1 << kind)) {
-                    if (isListElement(kind) || isListTerminator(kind)) return true;
+                    if (isListElement(kind, /* inErrorRecovery */ true) || isListTerminator(kind)) {
+                        return true;
+                    }
                 }
             }
 
@@ -734,12 +738,12 @@ module ts {
             var result = <NodeArray<T>>[];
             result.pos = getNodePos();
             while (!isListTerminator(kind)) {
-                if (isListElement(kind)) {
+                if (isListElement(kind, /* inErrorRecovery */ false)) {
                     result.push(parseElement());
                 }
                 else {
                     error(parsingContextErrors(kind));
-                    if (isInParsingContext()) {
+                    if (isInSomeParsingContext()) {
                         break;
                     }
                     nextToken();
@@ -761,7 +765,7 @@ module ts {
             var errorCountBeforeParsingList = file.syntacticErrors.length;
             var commaStart = -1; // Meaning the previous token was not a comma
             while (true) {
-                if (isListElement(kind)) {
+                if (isListElement(kind, /* inErrorRecovery */ false)) {
                     result.push(parseElement());
                     commaStart = scanner.getTokenPos();
                     if (parseOptional(SyntaxKind.CommaToken)) {
@@ -791,7 +795,7 @@ module ts {
                 }
                 else {
                     error(parsingContextErrors(kind));
-                    if (token !== SyntaxKind.CommaToken && isInParsingContext()) {
+                    if (token !== SyntaxKind.CommaToken && isInSomeParsingContext()) {
                         break;
                     }
                     nextToken();
@@ -2066,12 +2070,19 @@ module ts {
             return finishNode(node);
         }
 
-        function isStatement(): boolean {
+        function isStatement(inErrorRecovery: boolean): boolean {
             switch (token) {
+                case SyntaxKind.SemicolonToken:
+                    // If we're in error recovery, then we don't want to treat ';' as an empty statement.
+                    // The problem is that ';' can show up in far too many contexts, and if we see one 
+                    // and assume it's a statement, then we may bail out innapropriately from whatever 
+                    // we're parsing.  For example, if we have a semicolon in the middle of a class, then
+                    // we really don't want to assume the class is over and we're on a statement in the
+                    // outer module.  We just want to consume and move on.
+                    return !inErrorRecovery;
                 case SyntaxKind.OpenBraceToken:
                 case SyntaxKind.VarKeyword:
                 case SyntaxKind.FunctionKeyword:
-                case SyntaxKind.SemicolonToken:
                 case SyntaxKind.IfKeyword:
                 case SyntaxKind.DoKeyword:
                 case SyntaxKind.WhileKeyword:
@@ -2103,8 +2114,8 @@ module ts {
             }
         }
 
-        function isStatementOrFunction(): boolean {
-            return token === SyntaxKind.FunctionKeyword || isStatement();
+        function isStatementOrFunction(inErrorRecovery: boolean): boolean {
+            return token === SyntaxKind.FunctionKeyword || isStatement(inErrorRecovery);
         }
 
         function parseStatement(): Statement {
@@ -2813,8 +2824,8 @@ module ts {
             return result;
         }
 
-        function isSourceElement(): boolean {
-            return isDeclaration() || isStatement();
+        function isSourceElement(inErrorRecovery: boolean): boolean {
+            return isDeclaration() || isStatement(inErrorRecovery);
         }
 
         function parseSourceElement() {
diff --git a/tests/baselines/reference/ambientGetters.errors.txt b/tests/baselines/reference/ambientGetters.errors.txt
index a09ef7cf8cf..05c40581074 100644
--- a/tests/baselines/reference/ambientGetters.errors.txt
+++ b/tests/baselines/reference/ambientGetters.errors.txt
@@ -1,12 +1,10 @@
-==== tests/cases/compiler/ambientGetters.ts (3 errors) ====
+==== tests/cases/compiler/ambientGetters.ts (2 errors) ====
     
     declare class A {
         get length() : number;
                              ~
 !!! '{' expected.
     }
-    ~
-!!! Declaration or statement expected.
     
     declare class B {
         get length() { return 0; }
diff --git a/tests/baselines/reference/es6ClassTest3.errors.txt b/tests/baselines/reference/es6ClassTest3.errors.txt
index d16568b7c24..d666351dc9a 100644
--- a/tests/baselines/reference/es6ClassTest3.errors.txt
+++ b/tests/baselines/reference/es6ClassTest3.errors.txt
@@ -1,45 +1,19 @@
-==== tests/cases/compiler/es6ClassTest3.ts (15 errors) ====
+==== tests/cases/compiler/es6ClassTest3.ts (2 errors) ====
     module M {	
     	class Visibility {
     	    public foo() { };
     	                    ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
     	    private bar() { };
-    	    ~~~~~~~
-!!! Declaration or statement expected.
-    	                  ~
-!!! ';' expected.
-    	            ~~~
-!!! Cannot find name 'bar'.
+    	                     ~
+!!! Unexpected token. A constructor, method, accessor, or property was expected.
             private x: number;
-            ~~~~~~~
-!!! Declaration or statement expected.
-                       ~~~~~~
-!!! Cannot find name 'number'.
     	    public y: number;
-    	    ~~~~~~
-!!! Declaration or statement expected.
-    	              ~~~~~~
-!!! Cannot find name 'number'.
     	    public z: number;
-    	    ~~~~~~
-!!! Declaration or statement expected.
-    	              ~~~~~~
-!!! Cannot find name 'number'.
     
     	    constructor() {
-    	                  ~
-!!! ';' expected.
-    	    ~~~~~~~~~~~
-!!! Cannot find name 'constructor'.
     	        this.x = 1;
-    	        ~~~~
-!!! 'this' cannot be referenced in a module body.
     	        this.y = 2;
-    	        ~~~~
-!!! 'this' cannot be referenced in a module body.
     	    }
     	}
-    }
-    ~
-!!! Declaration or statement expected.
\ No newline at end of file
+    }
\ No newline at end of file
diff --git a/tests/baselines/reference/exportDeclareClass1.errors.txt b/tests/baselines/reference/exportDeclareClass1.errors.txt
index dee40634d35..6ee2bc0e090 100644
--- a/tests/baselines/reference/exportDeclareClass1.errors.txt
+++ b/tests/baselines/reference/exportDeclareClass1.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/exportDeclareClass1.ts (9 errors) ====
+==== tests/cases/compiler/exportDeclareClass1.ts (4 errors) ====
         export declare class eaC {
             static tF() { };
                         ~
@@ -6,21 +6,11 @@
                            ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
             static tsF(param:any) { };
-            ~~~~~~
-!!! Declaration or statement expected.
-                            ~
-!!! ',' expected.
                                   ~
-!!! ';' expected.
-                   ~~~
-!!! Cannot find name 'tsF'.
-                       ~~~~~
-!!! Cannot find name 'param'.
-                             ~~~
-!!! Cannot find name 'any'.
+!!! A function implementation cannot be declared in an ambient context.
+                                     ~
+!!! Unexpected token. A constructor, method, accessor, or property was expected.
         };
-        ~
-!!! Declaration or statement expected.
     	
     	export declare class eaC2 {
             static tF();
diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt
index 81e6d44af87..07c7126d8b5 100644
--- a/tests/baselines/reference/parser0_004152.errors.txt
+++ b/tests/baselines/reference/parser0_004152.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (38 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (34 errors) ====
     export class Game {
     ~~~~~~~~~~~~~~~~~~~
         private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0);
@@ -40,8 +40,7 @@
 !!! ';' expected.
                                                                                                      ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! Cannot compile external modules unless the '--module' flag is provided.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                ~~~~~~~~~~~~~~~
 !!! Cannot find name 'DisplayPosition'.
                                                       ~
@@ -69,14 +68,9 @@
                                                                                                    ~
 !!! Duplicate identifier '0'.
         private prevConfig: SeedCoords[][];
-        ~~~~~~~
-!!! Declaration or statement expected.
-                                       ~
-!!! Expression expected.
-                                         ~
-!!! Expression expected.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                             ~~~~~~~~~~
 !!! Cannot find name 'SeedCoords'.
     }
     ~
-!!! Declaration or statement expected.
\ No newline at end of file
+!!! Cannot compile external modules unless the '--module' flag is provided.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt
index e9566b75e13..ef853280daf 100644
--- a/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt
+++ b/tests/baselines/reference/parserEqualsGreaterThanAfterFunction2.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserEqualsGreaterThanAfterFunction2.ts (4 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserEqualsGreaterThanAfterFunction2.ts (5 errors) ====
     function (a => b;
              ~
 !!! Identifier expected.
@@ -6,5 +6,7 @@
 !!! ',' expected.
                     ~
 !!! ',' expected.
+                     
+!!! ')' expected.
     ~~~~~~~~~~~~~~~~~
 !!! Function implementation expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
index 70df299aca6..3caf228c1e0 100644
--- a/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
+++ b/tests/baselines/reference/parserErrantSemicolonInClass1.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (56 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserErrantSemicolonInClass1.ts (5 errors) ====
     class a {
         //constructor ();
         constructor (n: number);
@@ -12,137 +12,35 @@
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
     
         public pv;
-        ~~~~~~
-!!! Declaration or statement expected.
-               ~~
-!!! Cannot find name 'pv'.
         public get d() {
-        ~~~~~~
-!!! Declaration or statement expected.
                    ~
-!!! ';' expected.
-                       ~
-!!! ';' expected.
-               ~~~
-!!! Cannot find name 'get'.
-                   ~
-!!! Cannot find name 'd'.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
             return 30;
-            ~~~~~~~~~~
-!!! 'return' statement has no containing function.
         }
         public set d() {
-        ~~~~~~
-!!! Declaration or statement expected.
                    ~
-!!! ';' expected.
-                       ~
-!!! ';' expected.
-               ~~~
-!!! Cannot find name 'set'.
-                   ~
-!!! Cannot find name 'd'.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
         }
     
         public static get p2() {
-        ~~~~~~
-!!! Declaration or statement expected.
-               ~~~~~~
-!!! Declaration or statement expected.
                           ~~
-!!! ';' expected.
-                               ~
-!!! ';' expected.
-                      ~~~
-!!! Cannot find name 'get'.
-                          ~~
-!!! Cannot find name 'p2'.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
             return { x: 30, y: 40 };
-            ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! 'return' statement has no containing function.
         }
     
         private static d2() {
-        ~~~~~~~
-!!! Declaration or statement expected.
-                ~~~~~~
-!!! Declaration or statement expected.
-                            ~
-!!! ';' expected.
-                       ~~
-!!! Cannot find name 'd2'.
         }
         private static get p3() {
-        ~~~~~~~
-!!! Declaration or statement expected.
-                ~~~~~~
-!!! Declaration or statement expected.
                            ~~
-!!! ';' expected.
-                                ~
-!!! ';' expected.
-                       ~~~
-!!! Cannot find name 'get'.
-                           ~~
-!!! Cannot find name 'p3'.
+!!! Accessors are only available when targeting ECMAScript 5 and higher.
             return "string";
-            ~~~~~~~~~~~~~~~~
-!!! 'return' statement has no containing function.
         }
         private pv3;
-        ~~~~~~~
-!!! Declaration or statement expected.
-                ~~~
-!!! Cannot find name 'pv3'.
     
         private foo(n: number): string;
-        ~~~~~~~
-!!! Declaration or statement expected.
-                     ~
-!!! ',' expected.
-                              ~
-!!! ';' expected.
-                ~~~
-!!! Cannot find name 'foo'.
-                    ~
-!!! Cannot find name 'n'.
-                       ~~~~~~
-!!! Cannot find name 'number'.
-                                ~~~~~~
-!!! Cannot find name 'string'.
         private foo(s: string): string;
-        ~~~~~~~
-!!! Declaration or statement expected.
-                     ~
-!!! ',' expected.
-                              ~
-!!! ';' expected.
-                ~~~
-!!! Cannot find name 'foo'.
-                    ~
-!!! Cannot find name 's'.
-                       ~~~~~~
-!!! Cannot find name 'string'.
-                                ~~~~~~
-!!! Cannot find name 'string'.
         private foo(ns: any) {
-        ~~~~~~~
-!!! Declaration or statement expected.
-                      ~
-!!! ',' expected.
-                             ~
-!!! ';' expected.
-                ~~~
-!!! Cannot find name 'foo'.
-                    ~~
-!!! Cannot find name 'ns'.
-                        ~~~
-!!! Cannot find name 'any'.
             return ns.toString();
-            ~~~~~~~~~~~~~~~~~~~~~
-!!! 'return' statement has no containing function.
         }
     }
-    ~
-!!! Declaration or statement expected.
     
\ No newline at end of file
diff --git a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt
index 7db5f08033c..472e7e237a3 100644
--- a/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt
+++ b/tests/baselines/reference/parserMissingLambdaOpenBrace1.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts (10 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserMissingLambdaOpenBrace1.ts (9 errors) ====
     class C {
         where(filter: Iterator<T, boolean>): Query<T> {
                       ~~~~~~~~~~~~~~~~~~~~
@@ -22,8 +22,6 @@
               ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
         }
-        ~
-!!! Declaration or statement expected.
     }
     ~
 !!! Declaration or statement expected.
\ No newline at end of file
diff --git a/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
new file mode 100644
index 00000000000..0780b807ead
--- /dev/null
+++ b/tests/baselines/reference/parsingClassRecoversWhenHittingUnexpectedSemicolon.errors.txt
@@ -0,0 +1,8 @@
+==== tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts (1 errors) ====
+    class C {
+        public f() { };
+                      ~
+!!! Unexpected token. A constructor, method, accessor, or property was expected.
+        private m;
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/primitiveMembers.errors.txt b/tests/baselines/reference/primitiveMembers.errors.txt
index 3134927df80..325dcbd1f6c 100644
--- a/tests/baselines/reference/primitiveMembers.errors.txt
+++ b/tests/baselines/reference/primitiveMembers.errors.txt
@@ -1,4 +1,4 @@
-==== tests/cases/compiler/primitiveMembers.ts (6 errors) ====
+==== tests/cases/compiler/primitiveMembers.ts (4 errors) ====
     var x = 5;
     var r = /yo/;
     r.source;
@@ -29,13 +29,9 @@
     class baz { public bar(): void { }; }
                                       ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
-                                        ~
-!!! Declaration or statement expected.
     class foo extends baz { public bar(){ return undefined}; }
                                                            ~
 !!! Unexpected token. A constructor, method, accessor, or property was expected.
-                                                             ~
-!!! Declaration or statement expected.
     
     
     
diff --git a/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
new file mode 100644
index 00000000000..4ec21368fb8
--- /dev/null
+++ b/tests/cases/compiler/parsingClassRecoversWhenHittingUnexpectedSemicolon.ts
@@ -0,0 +1,4 @@
+class C {
+    public f() { };
+    private m;
+}

From 5ae265b7558fbe9f33a1900dee469b7fbb2e0379 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 15 Jul 2014 14:28:08 -0700
Subject: [PATCH 07/13] Removed unnecessary check for commas in
 'parseDelimitedList'.

---
 src/compiler/parser.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 5de28b69de9..48eb40461cb 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -795,7 +795,7 @@ module ts {
                 }
                 else {
                     error(parsingContextErrors(kind));
-                    if (token !== SyntaxKind.CommaToken && isInSomeParsingContext()) {
+                    if (isInSomeParsingContext()) {
                         break;
                     }
                     nextToken();

From b8c96a2bcd5ac69eb3ad95d265e7460d12e1ba08 Mon Sep 17 00:00:00 2001
From: Jason Freeman <jfreeman@microsoft.com>
Date: Wed, 16 Jul 2014 14:29:37 -0700
Subject: [PATCH 08/13] Remove assert

---
 src/compiler/tc.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/compiler/tc.ts b/src/compiler/tc.ts
index f5958d118f1..0de66b58572 100644
--- a/src/compiler/tc.ts
+++ b/src/compiler/tc.ts
@@ -79,8 +79,6 @@ module ts {
     function reportErrors(errors: Diagnostic[]) {
         for (var i = 0; i < errors.length; i++) {
             var error = errors[i];
-            // TODO(jfreeman): Remove assert
-            Debug.assert(error.messageText.indexOf("{NL}") < 0);
             if (error.file) {
                 var loc = error.file.getLineAndCharacterFromPosition(error.start);
                 sys.writeErr(error.file.filename + "(" + loc.line + "," + loc.character + "): " + error.messageText + sys.newLine);

From e41671e3b98322535236f66f581a20b1adf1e90b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 16 Jul 2014 15:57:55 -0700
Subject: [PATCH 09/13] Update .npmignore

remove unused references
---
 .npmignore | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.npmignore b/.npmignore
index fd2663ae5b4..99b51a2b65c 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,12 +1,5 @@
 built
 doc
-samples
 src
 tests
-typings
-bin/winjs.d.ts
-bin/winrt.d.ts
-bin/*.bat
-bin/jquery.d.ts
-bin/typescriptServices.js
 Jakefile

From 0903a93bdc18168d4631bb5ca1c6d566f37b51a8 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 16 Jul 2014 16:00:04 -0700
Subject: [PATCH 10/13] Update .gitignore

remove unused file references
---
 .gitignore | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index d7fdc4a75ee..9589707e25b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 node_modules/
 built/
-bin/wrapped_tsc.js
 tests/cases/*.js
 tests/cases/*/*.js
 tests/cases/*/*/*.js
@@ -14,14 +13,7 @@ tests/cases/*/*/*/*/*.js.map
 tests/cases/rwc/*
 tests/cases/perf/*
 !tests/cases/webharness/compilerToString.js
-tests/runners/*.js
-tests/runners/*/*.js
-tests/runners/rwc/*
-!tests/runners/rwc/rwcRunner.ts
-!tests/runners/rwc/loggedIO.ts
-diff-*.html
 test-args.txt
-*.suo
 ~*.docx
 tests/baselines/local/*
 tests/baselines/reference/projectOutput/
@@ -32,35 +24,15 @@ tests/services/baselines/prototyping/local/*
 tests/services/browser/typescriptServices.js
 scripts/processDiagnosticMessages.d.ts
 scripts/processDiagnosticMessages.js
-src/compiler/*.js
-src/compiler/syntax/wrapped_SyntaxGenerator.js
-src/compiler/syntax/SyntaxGenerator.js
-src/compiler/syntax/SyntaxGenerator.d.ts
-src/compiler/prototype/*.js
-src/services/*.js
-src/services/*/*.js
 src/harness/*.js
-src/prototype/*.js
-src/prototype/*/*.js
-baseline-report.html
-fidelity-report.html
 rwc-report.html
 *.swp
 build.json
-monaco.editor.json
-samples/win8/encyclopedia/Encyclopedia/js/*.js
-samples/win8/encyclopedia/Encyclopedia/js/*.js.map
-samples/win8/encyclopedia/Encyclopedia/bin/
-samples/win8/encyclopedia/Encyclopedia/bld/
-samples/win8/encyclopedia/Encyclopedia/Encyclopedia.jsproj.user
 *.actual
-tests/Fidelity/*.d.ts
-tests/Fidelity/*.js
-tests/cases/webharness/*.d.ts
 tests/webhost/*.d.ts
 tests/webhost/webtsc.js
 tests/*.js
 tests/*.d.ts
 *.config
 scripts/debug.bat
-scripts/run.bat
\ No newline at end of file
+scripts/run.bat

From c49e9b203728faa4ee82813a94032bca9312a658 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 16 Jul 2014 16:06:03 -0700
Subject: [PATCH 11/13] Update package.json

update links
---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 1add14ef575..809ba9074c4 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 	"licenses": [
 		{
 			"type": "Apache License 2.0", 
-			"url": "http://typescript.codeplex.com/license"
+			"url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
 		}
 	],
 	"description": "TypeScript is a language for application scale JavaScript development",
@@ -18,14 +18,14 @@
 		"javascript"
 	],
 	"bugs": {
-		"url" : "http://typescript.codeplex.com/workitem/list/basic"
+		"url" : "https://github.com/Microsoft/TypeScript/issues"
 	},
 	"repository" : { 
 		"type" : "git",	
-		"url" : "https://git01.codeplex.com/typescript"  
+		"url" : "https://github.com/Microsoft/TypeScript.git"  
 	},
 	"preferGlobal" : true,
-	"main" : "./bin/typescript.js",
+	"main" : "./bin/tc.js",
 	"bin" : { 
 		"tsc" : "./bin/tsc" 
 	},

From 72d7535bad2404d272748897ccaaa18e24b27231 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 16 Jul 2014 16:06:45 -0700
Subject: [PATCH 12/13] Update tsc

update link
---
 bin/tsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/tsc b/bin/tsc
index 3c0dab574f2..9c392ee8e3b 100644
--- a/bin/tsc
+++ b/bin/tsc
@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('./tsc.js')
+require('./tc.js')

From cb6a44e0860448bb73bbfb2aaf0aa7669fe15bb0 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Wed, 16 Jul 2014 16:14:32 -0700
Subject: [PATCH 13/13] Update README.md

update dependencies list and added links
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c7b6844c697..9846b75e144 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,8 @@ tsc hello.ts
 
 ## Building
 
-1.  Install Node if you haven't already (http://nodejs.org/)
-2.  Install Jake, the tool we use to build our compiler (https://github.com/mde/jake). To do this, run "npm install -g jake".
+1.  Install [node](http://nodejs.org/) if you haven't already
+2.  Install dependencies ([Jake](https://github.com/mde/jake), [mocha](http://visionmedia.github.io/mocha/), [Chai](http://chaijs.com/) and [browserify](http://browserify.org/) the tool we use to build our compiler. To do this, run `npm install`.
 3.  To use jake, run one of the following commands: 
     - jake local - This builds the compiler. The output is in built/local in the public directory 
     - jake clean - deletes the build compiler