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;