From 850bbe029e335a5a6257750ef0806778e2849890 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <wewigham@microsoft.com>
Date: Fri, 23 Mar 2018 15:24:20 -0700
Subject: [PATCH] use import types in nodebuilder for typeof module symbols

---
 .../reference/aliasAssignments.errors.txt     |  8 +--
 .../aliasOnMergedModuleInterface.types        |  2 +-
 .../allowSyntheticDefaultImports10.errors.txt |  8 +--
 .../ambientDeclarationsPatterns.types         |  8 +--
 ...eclarationsPatterns_tooManyAsterisks.types |  2 +-
 .../ambientExportDefaultErrors.types          |  6 +-
 ...xternalModuleInAnotherExternalModule.types |  2 +-
 ...mbientExternalModuleInsideNonAmbient.types |  2 +-
 .../ambientExternalModuleMerging.types        |  4 +-
 .../ambientExternalModuleReopen.types         |  4 +-
 ...ithRelativeExternalImportDeclaration.types |  2 +-
 ...ExternalModuleWithRelativeModuleName.types |  4 +-
 .../reference/ambientRequireFunction.types    |  8 +--
 .../reference/augmentExportEquals1_1.types    |  2 +-
 .../reference/augmentExportEquals2_1.types    |  2 +-
 .../reference/augmentExportEquals3_1.types    |  2 +-
 .../reference/augmentExportEquals4_1.types    |  2 +-
 .../reference/augmentExportEquals5.types      |  2 +-
 .../reference/augmentExportEquals6_1.types    |  2 +-
 .../reference/augmentExportEquals7.types      |  2 +-
 .../reference/bangInModuleName.types          |  2 +-
 .../reference/commonJsUnusedLocals.types      |  2 +-
 .../reference/commonSourceDirectory.types     |  2 +-
 .../reference/commonjsAccessExports.types     |  8 +--
 .../complexRecursiveCollections.types         |  2 +-
 ...structorWithIncompleteTypeAnnotation.types |  2 +-
 .../reference/cyclicModuleImport.types        |  4 +-
 .../declFileAliasUseBeforeDeclaration2.types  |  2 +-
 ...ternalModuleWithSingleExportedModule.types |  2 +-
 .../declarationEmitRelativeModuleError.types  |  4 +-
 .../reference/declarationMerging2.types       |  2 +-
 ...ernalModuleWithExportAssignedFundule.types |  2 +-
 .../es5ExportDefaultClassDeclaration4.types   |  2 +-
 ...es5ExportDefaultFunctionDeclaration4.types |  2 +-
 .../reference/es6ExportAssignment4.types      |  2 +-
 .../reference/es6ExportEqualsInterop.types    | 20 +++----
 .../es6ImportEqualsDeclaration2.types         |  4 +-
 .../reference/exportAsNamespace.d.types       |  2 +-
 ...portDeclarationsInAmbientNamespaces2.types |  2 +-
 .../reference/exportDefaultProperty.types     |  4 +-
 .../reference/exportEqualsProperty.types      |  4 +-
 .../reference/exportNestedNamespaces.types    |  6 +-
 .../exportNestedNamespaces2.errors.txt        |  8 +--
 .../reference/exportNestedNamespaces2.types   | 14 ++---
 ...pecifierAndExportedMemberDeclaration.types |  4 +-
 ...rtSpecifierAndLocalMemberDeclaration.types |  4 +-
 ...pecifierReferencingOuterDeclaration1.types |  2 +-
 ...pecifierReferencingOuterDeclaration3.types |  2 +-
 .../reference/exportsInAmbientModules1.types  |  2 +-
 .../reference/exportsInAmbientModules2.types  |  2 +-
 ...ionsForbiddenInParameterInitializers.types |  8 +--
 ...externalModuleImmutableBindings.errors.txt | 24 ++++----
 ...olutionOrderInImportDeclaration.errors.txt |  4 +-
 ...ceResolutionOrderInImportDeclaration.types |  2 +-
 .../reference/importAsBaseClass.errors.txt    |  4 +-
 .../importCallExpression1ESNext.types         | 26 ++++----
 .../importCallExpression2ESNext.types         |  2 +-
 .../importCallExpression3ESNext.types         |  6 +-
 .../importCallExpression4ESNext.types         | 30 +++++-----
 .../importCallExpressionAsyncES3AMD.types     | 30 +++++-----
 .../importCallExpressionAsyncES3CJS.types     | 30 +++++-----
 .../importCallExpressionAsyncES3System.types  | 30 +++++-----
 .../importCallExpressionAsyncES3UMD.types     | 30 +++++-----
 .../importCallExpressionAsyncES5AMD.types     | 30 +++++-----
 .../importCallExpressionAsyncES5CJS.types     | 30 +++++-----
 .../importCallExpressionAsyncES5System.types  | 30 +++++-----
 .../importCallExpressionAsyncES5UMD.types     | 30 +++++-----
 .../importCallExpressionAsyncES6AMD.types     | 30 +++++-----
 .../importCallExpressionAsyncES6CJS.types     | 30 +++++-----
 .../importCallExpressionAsyncES6System.types  | 30 +++++-----
 .../importCallExpressionAsyncES6UMD.types     | 30 +++++-----
 .../importCallExpressionAsyncESNext.types     | 30 +++++-----
 ...tCallExpressionCheckReturntype1.errors.txt | 24 ++++----
 ...importCallExpressionDeclarationEmit2.types |  4 +-
 .../importCallExpressionES5AMD.types          | 34 +++++------
 .../importCallExpressionES5CJS.types          | 34 +++++------
 .../importCallExpressionES5System.types       | 34 +++++------
 .../importCallExpressionES5UMD.types          | 34 +++++------
 .../importCallExpressionES6AMD.types          | 34 +++++------
 .../importCallExpressionES6CJS.types          | 34 +++++------
 .../importCallExpressionES6System.types       | 34 +++++------
 .../importCallExpressionES6UMD.types          | 34 +++++------
 .../importCallExpressionErrorInES2015.types   | 22 +++----
 .../importCallExpressionInAMD1.types          | 26 ++++----
 .../importCallExpressionInAMD2.types          |  2 +-
 .../importCallExpressionInAMD3.types          |  6 +-
 .../importCallExpressionInAMD4.types          | 60 +++++++++----------
 .../importCallExpressionInCJS1.types          | 26 ++++----
 .../importCallExpressionInCJS2.types          |  8 +--
 .../importCallExpressionInCJS3.types          |  2 +-
 .../importCallExpressionInCJS4.types          |  6 +-
 .../importCallExpressionInCJS5.types          | 60 +++++++++----------
 ...importCallExpressionInScriptContext1.types |  4 +-
 ...importCallExpressionInScriptContext2.types |  4 +-
 .../importCallExpressionInSystem1.types       | 26 ++++----
 .../importCallExpressionInSystem2.types       |  2 +-
 .../importCallExpressionInSystem3.types       |  6 +-
 .../importCallExpressionInSystem4.types       | 60 +++++++++----------
 .../importCallExpressionInUMD1.types          | 26 ++++----
 .../importCallExpressionInUMD2.types          |  2 +-
 .../importCallExpressionInUMD3.types          |  6 +-
 .../importCallExpressionInUMD4.types          | 60 +++++++++----------
 .../importCallExpressionNestedAMD.types       |  6 +-
 .../importCallExpressionNestedAMD2.types      |  6 +-
 .../importCallExpressionNestedCJS.types       |  6 +-
 .../importCallExpressionNestedCJS2.types      |  6 +-
 .../importCallExpressionNestedES2015.types    |  6 +-
 .../importCallExpressionNestedES20152.types   |  6 +-
 .../importCallExpressionNestedESNext.types    |  6 +-
 .../importCallExpressionNestedESNext2.types   |  6 +-
 .../importCallExpressionNestedSystem.types    |  6 +-
 .../importCallExpressionNestedSystem2.types   |  6 +-
 .../importCallExpressionNestedUMD.types       |  6 +-
 .../importCallExpressionNestedUMD2.types      |  6 +-
 ...tCallExpressionNoModuleKindSpecified.types | 30 +++++-----
 ...importCallExpressionWithTypeArgument.types |  8 +--
 ...lWithDeclareModifierInAmbientContext.types |  2 +-
 ...rAndExportAssignmentInAmbientContext.types |  2 +-
 ...clWithExportModifierInAmbientContext.types |  2 +-
 ...rtShouldNotBeElidedInDeclarationEmit.types |  2 +-
 .../reference/importTsBeforeDTs.errors.txt    |  4 +-
 .../reference/importTypeAmbient.types         |  6 +-
 .../reference/importTypeAmbientMissing.types  |  2 +-
 .../baselines/reference/importTypeLocal.types |  2 +-
 ...ferenecing-aliased-type-throug-array.types |  2 +-
 .../reference/importsInAmbientModules1.types  |  2 +-
 .../reference/importsInAmbientModules2.types  |  2 +-
 .../reference/importsInAmbientModules3.types  |  2 +-
 .../reference/incompatibleExports1.types      |  4 +-
 .../reference/incompatibleExports2.types      |  2 +-
 ...sFileCompilationExternalPackageError.types |  2 +-
 .../reference/jsxImportInAttribute.types      |  2 +-
 .../baselines/reference/jsxViaImport.2.types  |  2 +-
 tests/baselines/reference/jsxViaImport.types  |  2 +-
 ...NodeModuleJsDepthDefaultsToZero.errors.txt |  4 +-
 .../maxNodeModuleJsDepthDefaultsToZero.types  |  2 +-
 .../reference/mergedDeclarations6.types       |  2 +-
 .../missingFunctionImplementation2.types      |  2 +-
 .../missingImportAfterModuleImport.types      |  2 +-
 ...ntationCollidingNamesInAugmentation1.types |  4 +-
 .../moduleAugmentationDeclarationEmit1.types  |  2 +-
 .../moduleAugmentationDeclarationEmit2.types  |  2 +-
 ...duleAugmentationDisallowedExtensions.types |  4 +-
 ...duleAugmentationExtendAmbientModule1.types |  4 +-
 ...duleAugmentationExtendAmbientModule2.types |  4 +-
 .../moduleAugmentationExtendFileModule1.types |  2 +-
 .../moduleAugmentationExtendFileModule2.types |  2 +-
 .../reference/moduleAugmentationGlobal5.types |  4 +-
 ...moduleAugmentationImportsAndExports1.types |  2 +-
 ...moduleAugmentationImportsAndExports2.types |  2 +-
 ...moduleAugmentationImportsAndExports3.types |  2 +-
 ...moduleAugmentationImportsAndExports4.types |  2 +-
 ...moduleAugmentationImportsAndExports5.types |  2 +-
 ...moduleAugmentationImportsAndExports6.types |  2 +-
 .../moduleAugmentationInAmbientModule1.types  |  8 +--
 .../moduleAugmentationInAmbientModule2.types  |  8 +--
 .../moduleAugmentationInAmbientModule3.types  | 12 ++--
 .../moduleAugmentationInAmbientModule4.types  | 12 ++--
 .../moduleAugmentationInAmbientModule5.types  |  4 +-
 .../moduleAugmentationNoNewNames.types        |  2 +-
 .../moduleAugmentationsBundledOutput1.types   |  8 +--
 .../moduleAugmentationsImports1.types         |  6 +-
 .../moduleAugmentationsImports2.types         |  6 +-
 .../moduleAugmentationsImports3.types         |  8 +--
 .../moduleAugmentationsImports4.types         | 10 ++--
 .../moduleElementsInWrongContext2.types       |  2 +-
 .../moduleElementsInWrongContext3.types       |  2 +-
 .../reference/moduleExportAlias.types         | 36 +++++------
 .../reference/moduleMergeConstructor.types    |  4 +-
 ...ionWithExtensions_withAmbientPresent.types |  2 +-
 ...Resolution_explicitNodeModulesImport.types |  2 +-
 .../module_augmentUninstantiatedModule.types  |  4 +-
 tests/baselines/reference/moduledecl.types    |  2 +-
 ...xportAssignmentsInAmbientDeclaration.types |  2 +-
 .../baselines/reference/nodeResolution5.types |  2 +-
 .../baselines/reference/nodeResolution7.types |  2 +-
 .../reference/paramTagOnCallExpression.types  |  2 +-
 .../reference/parserExportAssignment6.types   |  2 +-
 .../parserModuleDeclaration1.d.types          |  2 +-
 .../reference/parserModuleDeclaration1.types  |  2 +-
 .../reference/parserModuleDeclaration2.types  |  2 +-
 .../privacyCannotNameAccessorDeclFile.types   |  2 +-
 .../privacyCannotNameVarTypeDeclFile.types    |  2 +-
 ...ctionCannotNameParameterTypeDeclFile.types |  2 +-
 ...FunctionCannotNameReturnTypeDeclFile.types |  2 +-
 .../reference/privacyGloImport.types          |  6 +-
 .../privacyGloImportParseErrors.types         | 14 ++---
 .../reference/privacyImportParseErrors.types  | 28 ++++-----
 .../reactNamespaceImportPresevation.types     |  2 +-
 ...eExportAssignmentAndFindAliasedType1.types |  2 +-
 ...eExportAssignmentAndFindAliasedType2.types |  4 +-
 ...eExportAssignmentAndFindAliasedType3.types |  6 +-
 ...oduleNameWithSameLetDeclarationName2.types |  2 +-
 .../reference/shebangBeforeReferences.types   |  2 +-
 .../reference/spellingSuggestionModule.types  |  2 +-
 .../reference/systemExportAssignment3.types   |  2 +-
 .../reference/topLevelAmbientModule.types     |  2 +-
 ...opLevelModuleDeclarationAndFile.errors.txt |  4 +-
 .../topLevelModuleDeclarationAndFile.types    |  2 +-
 .../transformNestedGeneratorsWithTry.types    |  2 +-
 .../reference/tsxElementResolution19.types    |  2 +-
 .../baselines/reference/typeAliasExport.types |  2 +-
 .../typeFromParamTagForFunction.types         | 14 ++---
 .../reference/typeReferenceDirectives12.types |  2 +-
 .../reference/typeReferenceDirectives9.types  |  2 +-
 ...tsFromMultipleNodeModulesDirectories.types |  6 +-
 ...ootsFromNodeModulesInParentDirectory.types |  2 +-
 .../typeofAmbientExternalModules.errors.txt   | 12 ++--
 .../typeofExternalModules.errors.txt          | 12 ++--
 ...yExternalModuleStillHasInstance.errors.txt |  8 +--
 .../reference/umd-augmentation-1.types        |  2 +-
 .../reference/umd-augmentation-2.types        |  2 +-
 tests/baselines/reference/umd-errors.types    | 10 ++--
 tests/baselines/reference/umd1.types          |  2 +-
 tests/baselines/reference/umd3.types          |  2 +-
 tests/baselines/reference/umd4.types          |  2 +-
 tests/baselines/reference/umd5.types          |  2 +-
 .../reference/umdGlobalConflict.types         |  4 +-
 .../untypedModuleImport_allowJs.types         |  2 +-
 .../untypedModuleImport_vsAmbient.types       |  2 +-
 ...untypedModuleImport_withAugmentation.types |  2 +-
 ...ntypedModuleImport_withAugmentation2.types |  2 +-
 .../reference/varRequireFromJavascript.types  |  6 +-
 .../reference/varRequireFromTypescript.types  |  6 +-
 224 files changed, 980 insertions(+), 980 deletions(-)

diff --git a/tests/baselines/reference/aliasAssignments.errors.txt b/tests/baselines/reference/aliasAssignments.errors.txt
index 463f74e4c49f9..b93875bc6311a 100644
--- a/tests/baselines/reference/aliasAssignments.errors.txt
+++ b/tests/baselines/reference/aliasAssignments.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
-tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
+tests/cases/compiler/aliasAssignments_1.ts(3,1): error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
+tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
 
 
 ==== tests/cases/compiler/aliasAssignments_1.ts (2 errors) ====
@@ -7,11 +7,11 @@ tests/cases/compiler/aliasAssignments_1.ts(5,1): error TS2322: Type 'typeof "tes
     var x = moduleA;
     x = 1; // Should be error
     ~
-!!! error TS2322: Type '1' is not assignable to type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"'.
+!!! error TS2322: Type '1' is not assignable to type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")'.
     var y = 1;
     y = moduleA; // should be error
     ~
-!!! error TS2322: Type 'typeof "tests/cases/compiler/aliasAssignments_moduleA"' is not assignable to type 'number'.
+!!! error TS2322: Type 'typeof import("tests/cases/compiler/aliasAssignments_moduleA")' is not assignable to type 'number'.
     
 ==== tests/cases/compiler/aliasAssignments_moduleA.ts (0 errors) ====
     export class someClass {
diff --git a/tests/baselines/reference/aliasOnMergedModuleInterface.types b/tests/baselines/reference/aliasOnMergedModuleInterface.types
index fb9c197feecf2..3124e10b2f4e0 100644
--- a/tests/baselines/reference/aliasOnMergedModuleInterface.types
+++ b/tests/baselines/reference/aliasOnMergedModuleInterface.types
@@ -26,7 +26,7 @@ var x: foo.A = foo.bar("hello"); // foo.A should be ok but foo.bar should be err
 
 === tests/cases/compiler/aliasOnMergedModuleInterface_0.ts ===
 declare module "foo"
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 {
     module B {
 >B : any
diff --git a/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt b/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt
index 981f89214e2ca..b03fd005547ec 100644
--- a/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt
+++ b/tests/baselines/reference/allowSyntheticDefaultImports10.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
-tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+tests/cases/compiler/a.ts(2,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
+tests/cases/compiler/a.ts(3,5): error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
 
 
 ==== tests/cases/compiler/a.ts (2 errors) ====
     import Foo = require("./b");
     Foo.default.bar();
         ~~~~~~~
-!!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+!!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
     Foo.default.default.foo();
         ~~~~~~~
-!!! error TS2339: Property 'default' does not exist on type 'typeof "tests/cases/compiler/b"'.
+!!! error TS2339: Property 'default' does not exist on type 'typeof import("tests/cases/compiler/b")'.
 ==== tests/cases/compiler/b.d.ts (0 errors) ====
     export function foo();
     
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns.types b/tests/baselines/reference/ambientDeclarationsPatterns.types
index 77cef7515b269..b3ea307d8c257 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns.types
+++ b/tests/baselines/reference/ambientDeclarationsPatterns.types
@@ -28,7 +28,7 @@ foo(fileText);
 
 === tests/cases/conformance/ambient/declarations.d.ts ===
 declare module "foo*baz" {
->"foo*baz" : typeof "foo*baz"
+>"foo*baz" : typeof import("foo*baz")
 
     export function foo(s: string): void;
 >foo : (s: string) => void
@@ -36,7 +36,7 @@ declare module "foo*baz" {
 }
 // Augmentations still work
 declare module "foo*baz" {
->"foo*baz" : typeof "foo*baz"
+>"foo*baz" : typeof import("foo*baz")
 
     export const baz: string;
 >baz : string
@@ -44,14 +44,14 @@ declare module "foo*baz" {
 
 // Longest prefix wins
 declare module "foos*" {
->"foos*" : typeof "foos*"
+>"foos*" : typeof import("foos*")
 
     export const foos: string;
 >foos : string
 }
 
 declare module "*!text" {
->"*!text" : typeof "*!text"
+>"*!text" : typeof import("*!text")
 
     const x: string;
 >x : string
diff --git a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
index 93ea5f185d064..5d2e087ca2312 100644
--- a/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
+++ b/tests/baselines/reference/ambientDeclarationsPatterns_tooManyAsterisks.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/ambient/ambientDeclarationsPatterns_tooManyAsterisks.ts ===
 declare module "too*many*asterisks" { }
->"too*many*asterisks" : typeof "too*many*asterisks"
+>"too*many*asterisks" : typeof import("too*many*asterisks")
 
diff --git a/tests/baselines/reference/ambientExportDefaultErrors.types b/tests/baselines/reference/ambientExportDefaultErrors.types
index c9c2351d444d6..4da013dcf5833 100644
--- a/tests/baselines/reference/ambientExportDefaultErrors.types
+++ b/tests/baselines/reference/ambientExportDefaultErrors.types
@@ -12,7 +12,7 @@ export default 2 + 2;
 >2 : 2
 
 export as namespace Foo;
->Foo : typeof "tests/cases/compiler/foo"
+>Foo : typeof import("tests/cases/compiler/foo")
 
 === tests/cases/compiler/foo2.d.ts ===
 export = 2 + 2;
@@ -26,7 +26,7 @@ export as namespace Foo2;
 === tests/cases/compiler/indirection.d.ts ===
 /// <reference path="./foo.d.ts" />
 declare module "indirect" {
->"indirect" : typeof "indirect"
+>"indirect" : typeof import("indirect")
 
     export default typeof Foo.default;
 >typeof Foo.default : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
@@ -38,7 +38,7 @@ declare module "indirect" {
 === tests/cases/compiler/indirection2.d.ts ===
 /// <reference path="./foo2.d.ts" />
 declare module "indirect2" {
->"indirect2" : typeof "indirect2"
+>"indirect2" : typeof import("indirect2")
 
     export = typeof Foo2;
 >typeof Foo2 : "string" | "number" | "boolean" | "symbol" | "undefined" | "object" | "function"
diff --git a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
index f335f5255d24d..3e0374e01aa55 100644
--- a/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
+++ b/tests/baselines/reference/ambientExternalModuleInAnotherExternalModule.types
@@ -6,7 +6,7 @@ export = D;
 >D : D
 
 declare module "ext" {
->"ext" : typeof "ext"
+>"ext" : typeof import("ext")
 
     export class C { }
 >C : C
diff --git a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
index be88c42d3f98f..61d2b36e3ec04 100644
--- a/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
+++ b/tests/baselines/reference/ambientExternalModuleInsideNonAmbient.types
@@ -3,5 +3,5 @@ module M {
 >M : any
 
     export declare module "M" { }
->"M" : typeof "M"
+>"M" : typeof import("M")
 }
diff --git a/tests/baselines/reference/ambientExternalModuleMerging.types b/tests/baselines/reference/ambientExternalModuleMerging.types
index 8150f6c6dfc03..fc40d94c65437 100644
--- a/tests/baselines/reference/ambientExternalModuleMerging.types
+++ b/tests/baselines/reference/ambientExternalModuleMerging.types
@@ -17,7 +17,7 @@ var y = M.y;
 
 === tests/cases/conformance/ambient/ambientExternalModuleMerging_declare.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export var x: string;
 >x : string
@@ -25,7 +25,7 @@ declare module "M" {
 
 // Merge
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export var y: string;
 >y : string
diff --git a/tests/baselines/reference/ambientExternalModuleReopen.types b/tests/baselines/reference/ambientExternalModuleReopen.types
index dffba752e0555..cbd1bda25b419 100644
--- a/tests/baselines/reference/ambientExternalModuleReopen.types
+++ b/tests/baselines/reference/ambientExternalModuleReopen.types
@@ -1,12 +1,12 @@
 === tests/cases/compiler/ambientExternalModuleReopen.ts ===
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     var x: string;
 >x : string
 }
 declare module 'fs' {
->'fs' : typeof "fs"
+>'fs' : typeof import("fs")
 
     var y: number;
 >y : number
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
index 4072b2fcedd42..5995d11442ccc 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeExternalImportDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeExternalImportDeclaration.ts ===
 declare module "OuterModule" {
->"OuterModule" : typeof "OuterModule"
+>"OuterModule" : typeof import("OuterModule")
 
     import m2 = require("./SubModule");
 >m2 : any
diff --git a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
index d585e8ed6a130..f061663aac8ad 100644
--- a/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
+++ b/tests/baselines/reference/ambientExternalModuleWithRelativeModuleName.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/ambientExternalModuleWithRelativeModuleName.ts ===
 declare module "./relativeModule" {
->"./relativeModule" : typeof "./relativeModule"
+>"./relativeModule" : typeof import("./relativeModule")
 
     var x: string;
 >x : string
 }
 
 declare module ".\\relativeModule" {
->".\\relativeModule" : typeof ".\\relativeModule"
+>".\\relativeModule" : typeof import(".\\\\relativeModule")
 
     var x: string;
 >x : string
diff --git a/tests/baselines/reference/ambientRequireFunction.types b/tests/baselines/reference/ambientRequireFunction.types
index ed34aa4309f77..d8d47964cfdfd 100644
--- a/tests/baselines/reference/ambientRequireFunction.types
+++ b/tests/baselines/reference/ambientRequireFunction.types
@@ -2,8 +2,8 @@
 /// <reference path="node.d.ts"/>
 
 const fs = require("fs");
->fs : typeof "fs"
->require("fs") : typeof "fs"
+>fs : typeof import("fs")
+>require("fs") : typeof import("fs")
 >require : (moduleName: string) => any
 >"fs" : "fs"
 
@@ -11,7 +11,7 @@ const text = fs.readFileSync("/a/b/c");
 >text : string
 >fs.readFileSync("/a/b/c") : string
 >fs.readFileSync : (s: string) => string
->fs : typeof "fs"
+>fs : typeof import("fs")
 >readFileSync : (s: string) => string
 >"/a/b/c" : "/a/b/c"
 
@@ -21,7 +21,7 @@ declare function require(moduleName: string): any;
 >moduleName : string
 
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     export function readFileSync(s: string): string;
 >readFileSync : (s: string) => string
diff --git a/tests/baselines/reference/augmentExportEquals1_1.types b/tests/baselines/reference/augmentExportEquals1_1.types
index 9077a27d32737..7c0a355d08caf 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.types
+++ b/tests/baselines/reference/augmentExportEquals1_1.types
@@ -10,7 +10,7 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     var x: number;
 >x : number
diff --git a/tests/baselines/reference/augmentExportEquals2_1.types b/tests/baselines/reference/augmentExportEquals2_1.types
index 9a619638a011e..a684b76dd51c3 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.types
+++ b/tests/baselines/reference/augmentExportEquals2_1.types
@@ -10,7 +10,7 @@ let a: x.A; // should not work
 
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     function foo(): void;
 >foo : () => void
diff --git a/tests/baselines/reference/augmentExportEquals3_1.types b/tests/baselines/reference/augmentExportEquals3_1.types
index f841fb315352e..b0c0e806f57b5 100644
--- a/tests/baselines/reference/augmentExportEquals3_1.types
+++ b/tests/baselines/reference/augmentExportEquals3_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     function foo(): void;
 >foo : typeof foo
diff --git a/tests/baselines/reference/augmentExportEquals4_1.types b/tests/baselines/reference/augmentExportEquals4_1.types
index 9daf444e41937..dbb36c39e4217 100644
--- a/tests/baselines/reference/augmentExportEquals4_1.types
+++ b/tests/baselines/reference/augmentExportEquals4_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     class foo {}
 >foo : foo
diff --git a/tests/baselines/reference/augmentExportEquals5.types b/tests/baselines/reference/augmentExportEquals5.types
index eaa956e1d4e9c..c071a195f0e1f 100644
--- a/tests/baselines/reference/augmentExportEquals5.types
+++ b/tests/baselines/reference/augmentExportEquals5.types
@@ -13,7 +13,7 @@ declare module Express {
 }
 
 declare module "express" {
->"express" : typeof "express"
+>"express" : typeof import("express")
 
     function e(): e.Express;
 >e : typeof e
diff --git a/tests/baselines/reference/augmentExportEquals6_1.types b/tests/baselines/reference/augmentExportEquals6_1.types
index 6929d99ad51c7..3e7c2596df48e 100644
--- a/tests/baselines/reference/augmentExportEquals6_1.types
+++ b/tests/baselines/reference/augmentExportEquals6_1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/file1.d.ts ===
 declare module "file1" {
->"file1" : typeof "file1"
+>"file1" : typeof import("file1")
 
     class foo {}
 >foo : foo
diff --git a/tests/baselines/reference/augmentExportEquals7.types b/tests/baselines/reference/augmentExportEquals7.types
index 4311a3c112e2b..b1626ff89252c 100644
--- a/tests/baselines/reference/augmentExportEquals7.types
+++ b/tests/baselines/reference/augmentExportEquals7.types
@@ -13,7 +13,7 @@ import * as lib from "lib";
 >lib : () => void
 
 declare module "lib" {
->"lib" : typeof "lib"
+>"lib" : typeof import("lib")
 
     export function fn(): void;
 >fn : () => void
diff --git a/tests/baselines/reference/bangInModuleName.types b/tests/baselines/reference/bangInModuleName.types
index 691ac6add0087..cb1a66f986d4e 100644
--- a/tests/baselines/reference/bangInModuleName.types
+++ b/tests/baselines/reference/bangInModuleName.types
@@ -6,7 +6,7 @@ import * as http from 'intern/dojo/node!http';
 
 === tests/cases/compiler/a.d.ts ===
 declare module "http" {
->"http" : typeof "http"
+>"http" : typeof import("http")
 }
 
 declare module 'intern/dojo/node!http' {
diff --git a/tests/baselines/reference/commonJsUnusedLocals.types b/tests/baselines/reference/commonJsUnusedLocals.types
index e792ad8e78282..55c07a7d23046 100644
--- a/tests/baselines/reference/commonJsUnusedLocals.types
+++ b/tests/baselines/reference/commonJsUnusedLocals.types
@@ -6,7 +6,7 @@ const x = 0;
 exports.y = 1;
 >exports.y = 1 : 1
 >exports.y : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >y : number
 >1 : 1
 
diff --git a/tests/baselines/reference/commonSourceDirectory.types b/tests/baselines/reference/commonSourceDirectory.types
index ea16e24b8513f..79f5d8aacd893 100644
--- a/tests/baselines/reference/commonSourceDirectory.types
+++ b/tests/baselines/reference/commonSourceDirectory.types
@@ -20,7 +20,7 @@ export const x = 0;
 
 === /types/bar.d.ts ===
 declare module "bar" {
->"bar" : typeof "bar"
+>"bar" : typeof import("bar")
 
     export const y = 0;
 >y : 0
diff --git a/tests/baselines/reference/commonjsAccessExports.types b/tests/baselines/reference/commonjsAccessExports.types
index 61d57d4b2cc05..639245e6cf92d 100644
--- a/tests/baselines/reference/commonjsAccessExports.types
+++ b/tests/baselines/reference/commonjsAccessExports.types
@@ -2,13 +2,13 @@
 exports.x = 0;
 >exports.x = 0 : 0
 >exports.x : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >x : number
 >0 : 0
 
 exports.x;
 >exports.x : number
->exports : typeof "/a"
+>exports : typeof import("/a")
 >x : number
 
 // Works nested
@@ -17,7 +17,7 @@ exports.x;
     exports.Cls = function() {
 >exports.Cls = function() {        this.x = 0;    } : () => void
 >exports.Cls : () => void
->exports : typeof "/a"
+>exports : typeof import("/a")
 >Cls : () => void
 >function() {        this.x = 0;    } : () => void
 
@@ -34,6 +34,6 @@ const instance = new exports.Cls();
 >instance : { x: number; }
 >new exports.Cls() : { x: number; }
 >exports.Cls : () => void
->exports : typeof "/a"
+>exports : typeof import("/a")
 >Cls : () => void
 
diff --git a/tests/baselines/reference/complexRecursiveCollections.types b/tests/baselines/reference/complexRecursiveCollections.types
index 80d007f788419..d29a9956e194d 100644
--- a/tests/baselines/reference/complexRecursiveCollections.types
+++ b/tests/baselines/reference/complexRecursiveCollections.types
@@ -3804,7 +3804,7 @@ declare module Immutable {
   }
 }
 declare module "immutable" {
->"immutable" : typeof "immutable"
+>"immutable" : typeof import("immutable")
 
   export = Immutable
 >Immutable : typeof Immutable
diff --git a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
index f0044067db8be..df80419ca16b9 100644
--- a/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
+++ b/tests/baselines/reference/constructorWithIncompleteTypeAnnotation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/constructorWithIncompleteTypeAnnotation.ts ===
 declare module "fs" {
->"fs" : typeof "fs"
+>"fs" : typeof import("fs")
 
     export class File {
 >File : File
diff --git a/tests/baselines/reference/cyclicModuleImport.types b/tests/baselines/reference/cyclicModuleImport.types
index 6d4d08084a3b5..5a70b358871cf 100644
--- a/tests/baselines/reference/cyclicModuleImport.types
+++ b/tests/baselines/reference/cyclicModuleImport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/cyclicModuleImport.ts ===
 declare module "SubModule" {
->"SubModule" : typeof "SubModule"
+>"SubModule" : typeof import("SubModule")
 
     import MainModule = require('MainModule');
 >MainModule : typeof MainModule
@@ -24,7 +24,7 @@ declare module "SubModule" {
 >SubModule : SubModule
 }
 declare module "MainModule" {
->"MainModule" : typeof "MainModule"
+>"MainModule" : typeof import("MainModule")
 
     import SubModule = require('SubModule');
 >SubModule : typeof SubModule
diff --git a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
index 0666cf3012406..8ac39078fa550 100644
--- a/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
+++ b/tests/baselines/reference/declFileAliasUseBeforeDeclaration2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declFileAliasUseBeforeDeclaration2.ts ===
 declare module "test" {
->"test" : typeof "test"
+>"test" : typeof import("test")
 
     module A {
 >A : typeof A
diff --git a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
index d60bed7c414bc..2a4246d022cd2 100644
--- a/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
+++ b/tests/baselines/reference/declFileAmbientExternalModuleWithSingleExportedModule.types
@@ -13,7 +13,7 @@ export var x: SubModule.m.m3.c;
 
 === tests/cases/compiler/declFileAmbientExternalModuleWithSingleExportedModule_0.ts ===
 declare module "SubModule" {
->"SubModule" : typeof "SubModule"
+>"SubModule" : typeof import("SubModule")
 
     export module m {
 >m : any
diff --git a/tests/baselines/reference/declarationEmitRelativeModuleError.types b/tests/baselines/reference/declarationEmitRelativeModuleError.types
index 56cb018c9b9e6..a134269d68b4b 100644
--- a/tests/baselines/reference/declarationEmitRelativeModuleError.types
+++ b/tests/baselines/reference/declarationEmitRelativeModuleError.types
@@ -1,10 +1,10 @@
 === tests/cases/compiler/declarationEmitRelativeModuleError.ts ===
 declare module "b:block" { // <-- no error anymore
->"b:block" : typeof "b:block"
+>"b:block" : typeof import("b:block")
     
 }
 
 declare module "b:/block" { // <-- still an error
->"b:/block" : typeof "b:/block"
+>"b:/block" : typeof import("b:/block")
     
 }
diff --git a/tests/baselines/reference/declarationMerging2.types b/tests/baselines/reference/declarationMerging2.types
index 890b1e3faa7b3..b36fc1110a982 100644
--- a/tests/baselines/reference/declarationMerging2.types
+++ b/tests/baselines/reference/declarationMerging2.types
@@ -15,7 +15,7 @@ export class A {
 === tests/cases/compiler/b.ts ===
 export {}
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
index e0936614fb24a..c399e959850d0 100644
--- a/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
+++ b/tests/baselines/reference/declareExternalModuleWithExportAssignedFundule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/declareExternalModuleWithExportAssignedFundule.ts ===
 declare module "express" {
->"express" : typeof "express"
+>"express" : typeof import("express")
 
     export = express;
 >express : typeof express
diff --git a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
index 3ff3bbfe502c3..faeb1d3425547 100644
--- a/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
+++ b/tests/baselines/reference/es5ExportDefaultClassDeclaration4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es5ExportDefaultClassDeclaration4.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export var before: C;
 >before : C
diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
index 88240e7861e96..fd44fcdfb4fb1 100644
--- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
+++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/es5ExportDefaultFunctionDeclaration4.ts ===
 declare module "bar" {
->"bar" : typeof "bar"
+>"bar" : typeof import("bar")
 
     var before: typeof func;
 >before : () => typeof func
diff --git a/tests/baselines/reference/es6ExportAssignment4.types b/tests/baselines/reference/es6ExportAssignment4.types
index 7265f066c8d00..e550a7de47dc6 100644
--- a/tests/baselines/reference/es6ExportAssignment4.types
+++ b/tests/baselines/reference/es6ExportAssignment4.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
->"a" : typeof "a"
+>"a" : typeof import("a")
 
     var a: number;
 >a : number
diff --git a/tests/baselines/reference/es6ExportEqualsInterop.types b/tests/baselines/reference/es6ExportEqualsInterop.types
index 112d317c228e2..a3d2400787b1b 100644
--- a/tests/baselines/reference/es6ExportEqualsInterop.types
+++ b/tests/baselines/reference/es6ExportEqualsInterop.types
@@ -320,7 +320,7 @@ export * from "class-module";
 
 === tests/cases/compiler/modules.d.ts ===
 declare module "interface" {
->"interface" : typeof "interface"
+>"interface" : typeof import("interface")
 
     interface Foo {
 >Foo : Foo
@@ -336,7 +336,7 @@ declare module "interface" {
 }
 
 declare module "variable" {
->"variable" : typeof "variable"
+>"variable" : typeof import("variable")
 
     var Foo: {
 >Foo : { a: number; b: number; }
@@ -352,7 +352,7 @@ declare module "variable" {
 }
 
 declare module "interface-variable" {
->"interface-variable" : typeof "interface-variable"
+>"interface-variable" : typeof import("interface-variable")
 
     interface Foo {
 >Foo : Foo
@@ -377,7 +377,7 @@ declare module "interface-variable" {
 }
 
 declare module "module" {
->"module" : typeof "module"
+>"module" : typeof import("module")
 
     module Foo {
 >Foo : typeof Foo
@@ -393,7 +393,7 @@ declare module "module" {
 }
 
 declare module "interface-module" {
->"interface-module" : typeof "interface-module"
+>"interface-module" : typeof import("interface-module")
 
     interface Foo {
 >Foo : Foo
@@ -418,7 +418,7 @@ declare module "interface-module" {
 }
 
 declare module "variable-module" {
->"variable-module" : typeof "variable-module"
+>"variable-module" : typeof import("variable-module")
 
     module Foo {
 >Foo : { a: number; b: number; }
@@ -447,7 +447,7 @@ declare module "variable-module" {
 }
 
 declare module "function" {
->"function" : typeof "function"
+>"function" : typeof import("function")
 
     function foo();
 >foo : () => any
@@ -457,7 +457,7 @@ declare module "function" {
 }
 
 declare module "function-module" {
->"function-module" : typeof "function-module"
+>"function-module" : typeof import("function-module")
 
     function foo();
 >foo : typeof foo
@@ -476,7 +476,7 @@ declare module "function-module" {
 }
 
 declare module "class" {
->"class" : typeof "class"
+>"class" : typeof import("class")
 
     class Foo {
 >Foo : Foo
@@ -492,7 +492,7 @@ declare module "class" {
 }
 
 declare module "class-module" {
->"class-module" : typeof "class-module"
+>"class-module" : typeof import("class-module")
 
     class Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/es6ImportEqualsDeclaration2.types b/tests/baselines/reference/es6ImportEqualsDeclaration2.types
index a3af23e6c1d01..c531f38deb874 100644
--- a/tests/baselines/reference/es6ImportEqualsDeclaration2.types
+++ b/tests/baselines/reference/es6ImportEqualsDeclaration2.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/server.d.ts ===
 declare module "other" {
->"other" : typeof "other"
+>"other" : typeof import("other")
 
     export class C { }
 >C : C
 }
 
 declare module "server" {
->"server" : typeof "server"
+>"server" : typeof import("server")
 
     import events = require("other"); // Ambient declaration, no error expected.
 >events : typeof events
diff --git a/tests/baselines/reference/exportAsNamespace.d.types b/tests/baselines/reference/exportAsNamespace.d.types
index 4952cb8863bc7..59988676ba2d3 100644
--- a/tests/baselines/reference/exportAsNamespace.d.types
+++ b/tests/baselines/reference/exportAsNamespace.d.types
@@ -5,5 +5,5 @@ export var X;
 >X : any
 
 export as namespace N
->N : typeof "tests/cases/compiler/exportAsNamespace"
+>N : typeof import("tests/cases/compiler/exportAsNamespace")
 
diff --git a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
index c0e629f7d35b2..e53e34a21d16e 100644
--- a/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
+++ b/tests/baselines/reference/exportDeclarationsInAmbientNamespaces2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportDeclarationsInAmbientNamespaces2.ts ===
 declare module "mod" {
->"mod" : typeof "mod"
+>"mod" : typeof import("mod")
 
     export var x: number;
 >x : number
diff --git a/tests/baselines/reference/exportDefaultProperty.types b/tests/baselines/reference/exportDefaultProperty.types
index 55801a1d92d9c..fc19dcf3ad6e9 100644
--- a/tests/baselines/reference/exportDefaultProperty.types
+++ b/tests/baselines/reference/exportDefaultProperty.types
@@ -56,7 +56,7 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
->"foobar" : typeof "foobar"
+>"foobar" : typeof import("foobar")
 
     export default foo.bar;
 >foo.bar : typeof foo.bar
@@ -65,7 +65,7 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
->"foobarx" : typeof "foobarx"
+>"foobarx" : typeof import("foobarx")
 
     export default foo.bar.X;
 >foo.bar.X : number
diff --git a/tests/baselines/reference/exportEqualsProperty.types b/tests/baselines/reference/exportEqualsProperty.types
index cb89e4c1df090..dbe19fa7d5aa0 100644
--- a/tests/baselines/reference/exportEqualsProperty.types
+++ b/tests/baselines/reference/exportEqualsProperty.types
@@ -51,7 +51,7 @@ declare namespace foo.bar {
 }
 
 declare module "foobar" {
->"foobar" : typeof "foobar"
+>"foobar" : typeof import("foobar")
 
     export = foo.bar;
 >foo.bar : typeof foo.bar
@@ -60,7 +60,7 @@ declare module "foobar" {
 }
 
 declare module "foobarx" {
->"foobarx" : typeof "foobarx"
+>"foobarx" : typeof import("foobarx")
 
     export = foo.bar.X;
 >foo.bar.X : number
diff --git a/tests/baselines/reference/exportNestedNamespaces.types b/tests/baselines/reference/exportNestedNamespaces.types
index 893ed56ef7089..9b8e84332e876 100644
--- a/tests/baselines/reference/exportNestedNamespaces.types
+++ b/tests/baselines/reference/exportNestedNamespaces.types
@@ -2,7 +2,7 @@
 exports.n = {};
 >exports.n = {} : typeof __object
 >exports.n : typeof __object
->exports : typeof "tests/cases/conformance/salsa/mod"
+>exports : typeof import("tests/cases/conformance/salsa/mod")
 >n : typeof __object
 >{} : typeof __object
 
@@ -10,7 +10,7 @@ exports.n.K = function () {
 >exports.n.K = function () {    this.x = 10;} : () => void
 >exports.n.K : () => void
 >exports.n : typeof __object
->exports : typeof "tests/cases/conformance/salsa/mod"
+>exports : typeof import("tests/cases/conformance/salsa/mod")
 >n : typeof __object
 >K : () => void
 >function () {    this.x = 10;} : () => void
@@ -25,7 +25,7 @@ exports.n.K = function () {
 exports.Classic = class {
 >exports.Classic = class {    constructor() {        this.p = 1    }} : typeof (Anonymous class)
 >exports.Classic : typeof (Anonymous class)
->exports : typeof "tests/cases/conformance/salsa/mod"
+>exports : typeof import("tests/cases/conformance/salsa/mod")
 >Classic : typeof (Anonymous class)
 >class {    constructor() {        this.p = 1    }} : typeof (Anonymous class)
 
diff --git a/tests/baselines/reference/exportNestedNamespaces2.errors.txt b/tests/baselines/reference/exportNestedNamespaces2.errors.txt
index f8378e27776a7..7b4b3284f7223 100644
--- a/tests/baselines/reference/exportNestedNamespaces2.errors.txt
+++ b/tests/baselines/reference/exportNestedNamespaces2.errors.txt
@@ -1,9 +1,9 @@
 tests/cases/conformance/salsa/first.js(1,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/first"' because it is not a variable.
 tests/cases/conformance/salsa/first.js(1,11): error TS2304: Cannot find name 'require'.
-tests/cases/conformance/salsa/first.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof "tests/cases/conformance/salsa/first"'.
+tests/cases/conformance/salsa/first.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/first")'.
 tests/cases/conformance/salsa/second.js(1,1): error TS2539: Cannot assign to '"tests/cases/conformance/salsa/second"' because it is not a variable.
 tests/cases/conformance/salsa/second.js(1,11): error TS2304: Cannot find name 'require'.
-tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof "tests/cases/conformance/salsa/second"'.
+tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/second")'.
 
 
 ==== tests/cases/conformance/salsa/mod.js (0 errors) ====
@@ -17,7 +17,7 @@ tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters
 !!! error TS2304: Cannot find name 'require'.
     exports.formatters.j = function (v) {
             ~~~~~~~~~~
-!!! error TS2339: Property 'formatters' does not exist on type 'typeof "tests/cases/conformance/salsa/first"'.
+!!! error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/first")'.
         return v
     }
 ==== tests/cases/conformance/salsa/second.js (3 errors) ====
@@ -28,7 +28,7 @@ tests/cases/conformance/salsa/second.js(2,9): error TS2339: Property 'formatters
 !!! error TS2304: Cannot find name 'require'.
     exports.formatters.o = function (v) {
             ~~~~~~~~~~
-!!! error TS2339: Property 'formatters' does not exist on type 'typeof "tests/cases/conformance/salsa/second"'.
+!!! error TS2339: Property 'formatters' does not exist on type 'typeof import("tests/cases/conformance/salsa/second")'.
         return v
     }
     
diff --git a/tests/baselines/reference/exportNestedNamespaces2.types b/tests/baselines/reference/exportNestedNamespaces2.types
index 761c9bc604ec0..e15395866506b 100644
--- a/tests/baselines/reference/exportNestedNamespaces2.types
+++ b/tests/baselines/reference/exportNestedNamespaces2.types
@@ -3,15 +3,15 @@
 exports.formatters = {}
 >exports.formatters = {} : { [x: string]: any; }
 >exports.formatters : { [x: string]: any; }
->exports : typeof "tests/cases/conformance/salsa/mod"
+>exports : typeof import("tests/cases/conformance/salsa/mod")
 >formatters : { [x: string]: any; }
 >{} : { [x: string]: any; }
 
 === tests/cases/conformance/salsa/first.js ===
 exports = require('./mod')
->exports = require('./mod') : typeof "tests/cases/conformance/salsa/mod"
+>exports = require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >exports : any
->require('./mod') : typeof "tests/cases/conformance/salsa/mod"
+>require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >require : any
 >'./mod' : "./mod"
 
@@ -19,7 +19,7 @@ exports.formatters.j = function (v) {
 >exports.formatters.j = function (v) {    return v} : (v: any) => any
 >exports.formatters.j : any
 >exports.formatters : any
->exports : typeof "tests/cases/conformance/salsa/first"
+>exports : typeof import("tests/cases/conformance/salsa/first")
 >formatters : any
 >j : any
 >function (v) {    return v} : (v: any) => any
@@ -30,9 +30,9 @@ exports.formatters.j = function (v) {
 }
 === tests/cases/conformance/salsa/second.js ===
 exports = require('./mod')
->exports = require('./mod') : typeof "tests/cases/conformance/salsa/mod"
+>exports = require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >exports : any
->require('./mod') : typeof "tests/cases/conformance/salsa/mod"
+>require('./mod') : typeof import("tests/cases/conformance/salsa/mod")
 >require : any
 >'./mod' : "./mod"
 
@@ -40,7 +40,7 @@ exports.formatters.o = function (v) {
 >exports.formatters.o = function (v) {    return v} : (v: any) => any
 >exports.formatters.o : any
 >exports.formatters : any
->exports : typeof "tests/cases/conformance/salsa/second"
+>exports : typeof import("tests/cases/conformance/salsa/second")
 >formatters : any
 >o : any
 >function (v) {    return v} : (v: any) => any
diff --git a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
index a7c05f2c722b8..fdb1c5d8121a5 100644
--- a/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndExportedMemberDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportSpecifierAndExportedMemberDeclaration.ts ===
 declare module "m2" {
->"m2" : typeof "m2"
+>"m2" : typeof import("m2")
 
     export module X {
 >X : () => any
@@ -22,7 +22,7 @@ declare module "m2" {
 }
 
 declare module "m2" {
->"m2" : typeof "m2"
+>"m2" : typeof import("m2")
 
     function Z2(): X.I;
 >Z2 : () => X.I
diff --git a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
index 70fd8921c0a57..911ceaf0270f8 100644
--- a/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
+++ b/tests/baselines/reference/exportSpecifierAndLocalMemberDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/exportSpecifierAndLocalMemberDeclaration.ts ===
 declare module "m2" {
->"m2" : typeof "m2"
+>"m2" : typeof import("m2")
 
     module X {
 >X : any
@@ -22,7 +22,7 @@ declare module "m2" {
 }
 
 declare module "m2" {
->"m2" : typeof "m2"
+>"m2" : typeof import("m2")
 
     function Z2(): X.I;
 >Z2 : () => any
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
index 067667b0218e4..caf7243c164fc 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration1.types
@@ -4,7 +4,7 @@ declare module X { export interface bar { } }
 >bar : bar
 
 declare module "m" {
->"m" : typeof "m"
+>"m" : typeof import("m")
 
     export { X };
 >X : any
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
index 3d2cf9d96d3f6..f9c66c6a9a2aa 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration3.types
@@ -4,7 +4,7 @@ declare module X { export interface bar { } }
 >bar : bar
 
 declare module "m" {
->"m" : typeof "m"
+>"m" : typeof import("m")
 
     module X { export interface foo { } }
 >X : any
diff --git a/tests/baselines/reference/exportsInAmbientModules1.types b/tests/baselines/reference/exportsInAmbientModules1.types
index 468ffb682fc69..4dddfe9c6bbea 100644
--- a/tests/baselines/reference/exportsInAmbientModules1.types
+++ b/tests/baselines/reference/exportsInAmbientModules1.types
@@ -4,7 +4,7 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export {x} from "external"
 >x : number
diff --git a/tests/baselines/reference/exportsInAmbientModules2.types b/tests/baselines/reference/exportsInAmbientModules2.types
index bd764d02ce0f9..345ee5a2f11d2 100644
--- a/tests/baselines/reference/exportsInAmbientModules2.types
+++ b/tests/baselines/reference/exportsInAmbientModules2.types
@@ -4,7 +4,7 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export * from "external"
 }
diff --git a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
index 1fd11b0513bc5..6142c1066facc 100644
--- a/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
+++ b/tests/baselines/reference/expressionsForbiddenInParameterInitializers.types
@@ -1,9 +1,9 @@
 === tests/cases/compiler/bar.ts ===
 export async function foo({ foo = await import("./bar") }) {
->foo : ({ foo }: { foo?: typeof "tests/cases/compiler/bar"; }) => Promise<void>
->foo : typeof "tests/cases/compiler/bar"
->await import("./bar") : typeof "tests/cases/compiler/bar"
->import("./bar") : Promise<typeof "tests/cases/compiler/bar">
+>foo : ({ foo }: { foo?: typeof import("tests/cases/compiler/bar"); }) => Promise<void>
+>foo : typeof import("tests/cases/compiler/bar")
+>await import("./bar") : typeof import("tests/cases/compiler/bar")
+>import("./bar") : Promise<typeof import("tests/cases/compiler/bar")>
 >"./bar" : "./bar"
 }
 
diff --git a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
index 58e411e1035c5..d6a2be707e0b4 100644
--- a/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
+++ b/tests/baselines/reference/externalModuleImmutableBindings.errors.txt
@@ -1,25 +1,25 @@
 tests/cases/compiler/f2.ts(6,7): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(7,7): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
-tests/cases/compiler/f2.ts(8,7): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(8,7): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
 tests/cases/compiler/f2.ts(11,7): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(12,7): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(16,8): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(17,8): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
-tests/cases/compiler/f2.ts(18,8): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(18,8): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
 tests/cases/compiler/f2.ts(21,8): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(22,8): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(26,12): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(27,12): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(28,12): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(29,12): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
-tests/cases/compiler/f2.ts(30,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(31,12): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(30,12): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
+tests/cases/compiler/f2.ts(31,12): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
 tests/cases/compiler/f2.ts(35,13): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(36,13): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(37,13): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
 tests/cases/compiler/f2.ts(38,13): error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
-tests/cases/compiler/f2.ts(39,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
-tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+tests/cases/compiler/f2.ts(39,13): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
+tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
 
 
 ==== tests/cases/compiler/f1.ts (0 errors) ====
@@ -39,7 +39,7 @@ tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist
 !!! error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
     stuff.blah = 2;
           ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     stuff[n] = 3;
     
     stuff.x++;
@@ -59,7 +59,7 @@ tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist
 !!! error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
     (stuff.blah) = 2;
            ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     (stuff[n]) = 3;
     
     (stuff.x)++;
@@ -85,10 +85,10 @@ tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist
 !!! error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
     for (stuff.blah in []) {}
                ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     for (stuff.blah of []) {}
                ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     for (stuff[n] in []) {}
     for (stuff[n] of []) {}
     
@@ -106,10 +106,10 @@ tests/cases/compiler/f2.ts(40,13): error TS2339: Property 'blah' does not exist
 !!! error TS2540: Cannot assign to 'x' because it is a constant or a read-only property.
     for ((stuff.blah) in []) {}
                 ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     for ((stuff.blah) of []) {}
                 ~~~~
-!!! error TS2339: Property 'blah' does not exist on type 'typeof "tests/cases/compiler/f1"'.
+!!! error TS2339: Property 'blah' does not exist on type 'typeof import("tests/cases/compiler/f1")'.
     for ((stuff[n]) in []) {}
     for ((stuff[n]) of []) {}
     
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
index a0b34ecbee1a3..74ad59b4bb769 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts(4,7): error TS2339: Property 'bar' does not exist on type 'typeof "tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
+tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts(4,7): error TS2339: Property 'bar' does not exist on type 'typeof import("tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1")'.
 
 
 ==== tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file3.ts (1 errors) ====
@@ -7,7 +7,7 @@ tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_fi
     file1.foo();
     file1.bar();
           ~~~
-!!! error TS2339: Property 'bar' does not exist on type 'typeof "tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1"'.
+!!! error TS2339: Property 'bar' does not exist on type 'typeof import("tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1")'.
     
     
 ==== tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file1.ts (0 errors) ====
diff --git a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
index 9095955caac42..f75bfd713c15e 100644
--- a/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
+++ b/tests/baselines/reference/externalModuleRefernceResolutionOrderInImportDeclaration.types
@@ -22,7 +22,7 @@ export function foo() { };
 
 === tests/cases/compiler/externalModuleRefernceResolutionOrderInImportDeclaration_file2.ts ===
 declare module "externalModuleRefernceResolutionOrderInImportDeclaration_file1" {
->"externalModuleRefernceResolutionOrderInImportDeclaration_file1" : typeof "externalModuleRefernceResolutionOrderInImportDeclaration_file1"
+>"externalModuleRefernceResolutionOrderInImportDeclaration_file1" : typeof import("externalModuleRefernceResolutionOrderInImportDeclaration_file1")
 
     export function bar();
 >bar : () => any
diff --git a/tests/baselines/reference/importAsBaseClass.errors.txt b/tests/baselines/reference/importAsBaseClass.errors.txt
index 8f23baad5439c..737556c7d5103 100644
--- a/tests/baselines/reference/importAsBaseClass.errors.txt
+++ b/tests/baselines/reference/importAsBaseClass.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/importAsBaseClass_1.ts(2,21): error TS2507: Type 'typeof "tests/cases/compiler/importAsBaseClass_0"' is not a constructor function type.
+tests/cases/compiler/importAsBaseClass_1.ts(2,21): error TS2507: Type 'typeof import("tests/cases/compiler/importAsBaseClass_0")' is not a constructor function type.
 
 
 ==== tests/cases/compiler/importAsBaseClass_1.ts (1 errors) ====
     import Greeter = require("./importAsBaseClass_0");
     class Hello extends Greeter { }
                         ~~~~~~~
-!!! error TS2507: Type 'typeof "tests/cases/compiler/importAsBaseClass_0"' is not a constructor function type.
+!!! error TS2507: Type 'typeof import("tests/cases/compiler/importAsBaseClass_0")' is not a constructor function type.
     
 ==== tests/cases/compiler/importAsBaseClass_0.ts (0 errors) ====
     export class Greeter {
diff --git a/tests/baselines/reference/importCallExpression1ESNext.types b/tests/baselines/reference/importCallExpression1ESNext.types
index 29e2c3d261bc9..30fe9acd605ea 100644
--- a/tests/baselines/reference/importCallExpression1ESNext.types
+++ b/tests/baselines/reference/importCallExpression1ESNext.types
@@ -5,40 +5,40 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 })
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpression2ESNext.types b/tests/baselines/reference/importCallExpression2ESNext.types
index 084eb33dde95d..3527b92d4c46d 100644
--- a/tests/baselines/reference/importCallExpression2ESNext.types
+++ b/tests/baselines/reference/importCallExpression2ESNext.types
@@ -40,6 +40,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpression3ESNext.types b/tests/baselines/reference/importCallExpression3ESNext.types
index e517be6e722f4..4d81b4ec33115 100644
--- a/tests/baselines/reference/importCallExpression3ESNext.types
+++ b/tests/baselines/reference/importCallExpression3ESNext.types
@@ -14,9 +14,9 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : C
 >(await import("./0")).B : B
->(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0"
->await import("./0") : typeof "tests/cases/conformance/dynamicImport/0"
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>(await import("./0")) : typeof import("tests/cases/conformance/dynamicImport/0")
+>await import("./0") : typeof import("tests/cases/conformance/dynamicImport/0")
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 >B : typeof B
 
diff --git a/tests/baselines/reference/importCallExpression4ESNext.types b/tests/baselines/reference/importCallExpression4ESNext.types
index 74cc6ff8b28fa..82ddbf1db6571 100644
--- a/tests/baselines/reference/importCallExpression4ESNext.types
+++ b/tests/baselines/reference/importCallExpression4ESNext.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3AMD.types b/tests/baselines/reference/importCallExpressionAsyncES3AMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3AMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES3AMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3CJS.types b/tests/baselines/reference/importCallExpressionAsyncES3CJS.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3CJS.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES3CJS.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3System.types b/tests/baselines/reference/importCallExpressionAsyncES3System.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3System.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES3System.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES3UMD.types b/tests/baselines/reference/importCallExpressionAsyncES3UMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES3UMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES3UMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5AMD.types b/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5AMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5CJS.types b/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5CJS.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5System.types b/tests/baselines/reference/importCallExpressionAsyncES5System.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5System.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5System.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES5UMD.types b/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES5UMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6AMD.types b/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6AMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6CJS.types b/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6CJS.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6System.types b/tests/baselines/reference/importCallExpressionAsyncES6System.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6System.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6System.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncES6UMD.types b/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
+++ b/tests/baselines/reference/importCallExpressionAsyncES6UMD.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionAsyncESNext.types b/tests/baselines/reference/importCallExpressionAsyncESNext.types
index 4f6a2bb31bea1..1de333feaea79 100644
--- a/tests/baselines/reference/importCallExpressionAsyncESNext.types
+++ b/tests/baselines/reference/importCallExpressionAsyncESNext.types
@@ -3,9 +3,9 @@ export async function fn() {
 >fn : () => Promise<void>
 
     const req = await import('./test') // ONE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
@@ -16,9 +16,9 @@ export class cl1 {
 >m : () => Promise<void>
 
         const req = await import('./test') // TWO
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -32,9 +32,9 @@ export const obj = {
 >async () => {        const req = await import('./test') // THREE    } : () => Promise<void>
 
         const req = await import('./test') // THREE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
     }
 }
@@ -51,9 +51,9 @@ export class cl2 {
 >async () => {            const req = await import('./test') // FOUR        } : () => Promise<void>
 
             const req = await import('./test') // FOUR
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
         }
     }
@@ -64,9 +64,9 @@ export const l = async () => {
 >async () => {    const req = await import('./test') // FIVE} : () => Promise<void>
 
     const req = await import('./test') // FIVE
->req : typeof "tests/cases/conformance/dynamicImport/test"
->await import('./test') : typeof "tests/cases/conformance/dynamicImport/test"
->import('./test') : Promise<typeof "tests/cases/conformance/dynamicImport/test">
+>req : typeof import("tests/cases/conformance/dynamicImport/test")
+>await import('./test') : typeof import("tests/cases/conformance/dynamicImport/test")
+>import('./test') : Promise<typeof import("tests/cases/conformance/dynamicImport/test")>
 >'./test' : "./test"
 }
 
diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
index 39622f39b3f26..c62c7868e10be 100644
--- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
+++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
-  Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
-    Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
-tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
-  Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
-    Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
+tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
+  Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
+tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' cannot be converted to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
+  Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not comparable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+    Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
 
 
 ==== tests/cases/conformance/dynamicImport/anotherModule.ts (0 errors) ====
@@ -18,13 +18,13 @@ tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise<ty
     
     let p1: Promise<typeof anotherModule> = import("./defaultPath");
         ~~
-!!! error TS2322: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' is not assignable to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
-!!! error TS2322:   Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
-!!! error TS2322:     Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
+!!! error TS2322: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' is not assignable to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
+!!! error TS2322:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not assignable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! error TS2322:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
     let p2 = import("./defaultPath") as Promise<typeof anotherModule>;
              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2352: Type 'Promise<typeof "tests/cases/conformance/dynamicImport/defaultPath">' cannot be converted to type 'Promise<typeof "tests/cases/conformance/dynamicImport/anotherModule">'.
-!!! error TS2352:   Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'.
-!!! error TS2352:     Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'.
+!!! error TS2352: Type 'Promise<typeof import("tests/cases/conformance/dynamicImport/defaultPath")>' cannot be converted to type 'Promise<typeof import("tests/cases/conformance/dynamicImport/anotherModule")>'.
+!!! error TS2352:   Type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")' is not comparable to type 'typeof import("tests/cases/conformance/dynamicImport/anotherModule")'.
+!!! error TS2352:     Property 'D' is missing in type 'typeof import("tests/cases/conformance/dynamicImport/defaultPath")'.
     let p3: Promise<any> = import("./defaultPath");
     
\ No newline at end of file
diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit2.types b/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
index 5b8334775f100..802c00f35b4be 100644
--- a/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
+++ b/tests/baselines/reference/importCallExpressionDeclarationEmit2.types
@@ -5,7 +5,7 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionES5AMD.types b/tests/baselines/reference/importCallExpressionES5AMD.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES5AMD.types
+++ b/tests/baselines/reference/importCallExpressionES5AMD.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5CJS.types b/tests/baselines/reference/importCallExpressionES5CJS.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES5CJS.types
+++ b/tests/baselines/reference/importCallExpressionES5CJS.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5System.types b/tests/baselines/reference/importCallExpressionES5System.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES5System.types
+++ b/tests/baselines/reference/importCallExpressionES5System.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES5UMD.types b/tests/baselines/reference/importCallExpressionES5UMD.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES5UMD.types
+++ b/tests/baselines/reference/importCallExpressionES5UMD.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6AMD.types b/tests/baselines/reference/importCallExpressionES6AMD.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES6AMD.types
+++ b/tests/baselines/reference/importCallExpressionES6AMD.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6CJS.types b/tests/baselines/reference/importCallExpressionES6CJS.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES6CJS.types
+++ b/tests/baselines/reference/importCallExpressionES6CJS.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6System.types b/tests/baselines/reference/importCallExpressionES6System.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES6System.types
+++ b/tests/baselines/reference/importCallExpressionES6System.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionES6UMD.types b/tests/baselines/reference/importCallExpressionES6UMD.types
index e97f722b14ff5..ceb6a6fe29962 100644
--- a/tests/baselines/reference/importCallExpressionES6UMD.types
+++ b/tests/baselines/reference/importCallExpressionES6UMD.types
@@ -5,41 +5,41 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
 
@@ -50,8 +50,8 @@ class C {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
@@ -63,8 +63,8 @@ export class D {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
     }
 }
diff --git a/tests/baselines/reference/importCallExpressionErrorInES2015.types b/tests/baselines/reference/importCallExpressionErrorInES2015.types
index 53a1b3d08fa22..f0a055e7a0626 100644
--- a/tests/baselines/reference/importCallExpressionErrorInES2015.types
+++ b/tests/baselines/reference/importCallExpressionErrorInES2015.types
@@ -5,26 +5,26 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 })
@@ -33,7 +33,7 @@ function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpressionInAMD1.types b/tests/baselines/reference/importCallExpressionInAMD1.types
index 661d27d14692e..6d270e686edf2 100644
--- a/tests/baselines/reference/importCallExpressionInAMD1.types
+++ b/tests/baselines/reference/importCallExpressionInAMD1.types
@@ -5,40 +5,40 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpressionInAMD2.types b/tests/baselines/reference/importCallExpressionInAMD2.types
index 44b17eb51fd5c..8e33f8258d479 100644
--- a/tests/baselines/reference/importCallExpressionInAMD2.types
+++ b/tests/baselines/reference/importCallExpressionInAMD2.types
@@ -41,6 +41,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD3.types b/tests/baselines/reference/importCallExpressionInAMD3.types
index e517be6e722f4..4d81b4ec33115 100644
--- a/tests/baselines/reference/importCallExpressionInAMD3.types
+++ b/tests/baselines/reference/importCallExpressionInAMD3.types
@@ -14,9 +14,9 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : C
 >(await import("./0")).B : B
->(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0"
->await import("./0") : typeof "tests/cases/conformance/dynamicImport/0"
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>(await import("./0")) : typeof import("tests/cases/conformance/dynamicImport/0")
+>await import("./0") : typeof import("tests/cases/conformance/dynamicImport/0")
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 >B : typeof B
 
diff --git a/tests/baselines/reference/importCallExpressionInAMD4.types b/tests/baselines/reference/importCallExpressionInAMD4.types
index 156247851c914..afedd6f4b815f 100644
--- a/tests/baselines/reference/importCallExpressionInAMD4.types
+++ b/tests/baselines/reference/importCallExpressionInAMD4.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
@@ -91,27 +91,27 @@ export class D {
 >D : D
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -120,7 +120,7 @@ export class D {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -135,9 +135,9 @@ export class D {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -147,7 +147,7 @@ export class D {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionInCJS1.types b/tests/baselines/reference/importCallExpressionInCJS1.types
index 661d27d14692e..6d270e686edf2 100644
--- a/tests/baselines/reference/importCallExpressionInCJS1.types
+++ b/tests/baselines/reference/importCallExpressionInCJS1.types
@@ -5,40 +5,40 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpressionInCJS2.types b/tests/baselines/reference/importCallExpressionInCJS2.types
index 063a52245395d..d8d7e07df3a77 100644
--- a/tests/baselines/reference/importCallExpressionInCJS2.types
+++ b/tests/baselines/reference/importCallExpressionInCJS2.types
@@ -24,10 +24,10 @@ async function compute(promise: Promise<any>) {
 >j : any
 
         j = await import("./1");
->j = await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
+>j = await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
 >j : any
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
         return j.backup();
@@ -46,6 +46,6 @@ async function compute(promise: Promise<any>) {
 compute(import("./0"));
 >compute(import("./0")) : Promise<any>
 >compute : (promise: Promise<any>) => Promise<any>
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS3.types b/tests/baselines/reference/importCallExpressionInCJS3.types
index 44b17eb51fd5c..8e33f8258d479 100644
--- a/tests/baselines/reference/importCallExpressionInCJS3.types
+++ b/tests/baselines/reference/importCallExpressionInCJS3.types
@@ -41,6 +41,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS4.types b/tests/baselines/reference/importCallExpressionInCJS4.types
index e517be6e722f4..4d81b4ec33115 100644
--- a/tests/baselines/reference/importCallExpressionInCJS4.types
+++ b/tests/baselines/reference/importCallExpressionInCJS4.types
@@ -14,9 +14,9 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : C
 >(await import("./0")).B : B
->(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0"
->await import("./0") : typeof "tests/cases/conformance/dynamicImport/0"
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>(await import("./0")) : typeof import("tests/cases/conformance/dynamicImport/0")
+>await import("./0") : typeof import("tests/cases/conformance/dynamicImport/0")
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 >B : typeof B
 
diff --git a/tests/baselines/reference/importCallExpressionInCJS5.types b/tests/baselines/reference/importCallExpressionInCJS5.types
index 7d0c6f01cacd3..aea65c1407070 100644
--- a/tests/baselines/reference/importCallExpressionInCJS5.types
+++ b/tests/baselines/reference/importCallExpressionInCJS5.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import ("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import ("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import ("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
@@ -91,27 +91,27 @@ export class D {
 >D : D
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -120,7 +120,7 @@ export class D {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -135,9 +135,9 @@ export class D {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -147,7 +147,7 @@ export class D {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.types b/tests/baselines/reference/importCallExpressionInScriptContext1.types
index c318667c7d86a..76955c4daa425 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext1.types
+++ b/tests/baselines/reference/importCallExpressionInScriptContext1.types
@@ -5,8 +5,8 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function arguments() { } // this is allow as the file doesn't have implicit "use strict"
diff --git a/tests/baselines/reference/importCallExpressionInScriptContext2.types b/tests/baselines/reference/importCallExpressionInScriptContext2.types
index 4e9feaef9b0af..be0b66226d916 100644
--- a/tests/baselines/reference/importCallExpressionInScriptContext2.types
+++ b/tests/baselines/reference/importCallExpressionInScriptContext2.types
@@ -8,8 +8,8 @@ export function foo() { return "foo"; }
 >"use strict" : "use strict"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function arguments() { }
diff --git a/tests/baselines/reference/importCallExpressionInSystem1.types b/tests/baselines/reference/importCallExpressionInSystem1.types
index 661d27d14692e..6d270e686edf2 100644
--- a/tests/baselines/reference/importCallExpressionInSystem1.types
+++ b/tests/baselines/reference/importCallExpressionInSystem1.types
@@ -5,40 +5,40 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpressionInSystem2.types b/tests/baselines/reference/importCallExpressionInSystem2.types
index 44b17eb51fd5c..8e33f8258d479 100644
--- a/tests/baselines/reference/importCallExpressionInSystem2.types
+++ b/tests/baselines/reference/importCallExpressionInSystem2.types
@@ -41,6 +41,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInSystem3.types b/tests/baselines/reference/importCallExpressionInSystem3.types
index e517be6e722f4..4d81b4ec33115 100644
--- a/tests/baselines/reference/importCallExpressionInSystem3.types
+++ b/tests/baselines/reference/importCallExpressionInSystem3.types
@@ -14,9 +14,9 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : C
 >(await import("./0")).B : B
->(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0"
->await import("./0") : typeof "tests/cases/conformance/dynamicImport/0"
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>(await import("./0")) : typeof import("tests/cases/conformance/dynamicImport/0")
+>await import("./0") : typeof import("tests/cases/conformance/dynamicImport/0")
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 >B : typeof B
 
diff --git a/tests/baselines/reference/importCallExpressionInSystem4.types b/tests/baselines/reference/importCallExpressionInSystem4.types
index 156247851c914..afedd6f4b815f 100644
--- a/tests/baselines/reference/importCallExpressionInSystem4.types
+++ b/tests/baselines/reference/importCallExpressionInSystem4.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
@@ -91,27 +91,27 @@ export class D {
 >D : D
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -120,7 +120,7 @@ export class D {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -135,9 +135,9 @@ export class D {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -147,7 +147,7 @@ export class D {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionInUMD1.types b/tests/baselines/reference/importCallExpressionInUMD1.types
index 661d27d14692e..6d270e686edf2 100644
--- a/tests/baselines/reference/importCallExpressionInUMD1.types
+++ b/tests/baselines/reference/importCallExpressionInUMD1.types
@@ -5,40 +5,40 @@ export function foo() { return "foo"; }
 
 === tests/cases/conformance/dynamicImport/1.ts ===
 import("./0");
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 var p1 = import("./0");
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 p1.then(zero => {
 >p1.then(zero => {    return zero.foo();}) : Promise<string>
->p1.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->zero => {    return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>p1.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>zero => {    return zero.foo();} : (zero: typeof import("tests/cases/conformance/dynamicImport/0")) => string
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
     return zero.foo();
 >zero.foo() : string
 >zero.foo : () => string
->zero : typeof "tests/cases/conformance/dynamicImport/0"
+>zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
 });
 
 export var p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
 function foo() {
 >foo : () => void
 
     const p2 = import("./0");
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 }
diff --git a/tests/baselines/reference/importCallExpressionInUMD2.types b/tests/baselines/reference/importCallExpressionInUMD2.types
index 44b17eb51fd5c..8e33f8258d479 100644
--- a/tests/baselines/reference/importCallExpressionInUMD2.types
+++ b/tests/baselines/reference/importCallExpressionInUMD2.types
@@ -41,6 +41,6 @@ function foo(x: Promise<any>) {
 foo(import("./0"));
 >foo(import("./0")) : void
 >foo : (x: Promise<any>) => void
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importCallExpressionInUMD3.types b/tests/baselines/reference/importCallExpressionInUMD3.types
index e517be6e722f4..4d81b4ec33115 100644
--- a/tests/baselines/reference/importCallExpressionInUMD3.types
+++ b/tests/baselines/reference/importCallExpressionInUMD3.types
@@ -14,9 +14,9 @@ async function foo() {
     class C extends (await import("./0")).B {}
 >C : C
 >(await import("./0")).B : B
->(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0"
->await import("./0") : typeof "tests/cases/conformance/dynamicImport/0"
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>(await import("./0")) : typeof import("tests/cases/conformance/dynamicImport/0")
+>await import("./0") : typeof import("tests/cases/conformance/dynamicImport/0")
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 >B : typeof B
 
diff --git a/tests/baselines/reference/importCallExpressionInUMD4.types b/tests/baselines/reference/importCallExpressionInUMD4.types
index 156247851c914..afedd6f4b815f 100644
--- a/tests/baselines/reference/importCallExpressionInUMD4.types
+++ b/tests/baselines/reference/importCallExpressionInUMD4.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
@@ -91,27 +91,27 @@ export class D {
 >D : D
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -120,7 +120,7 @@ export class D {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -135,9 +135,9 @@ export class D {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -147,7 +147,7 @@ export class D {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD.types b/tests/baselines/reference/importCallExpressionNestedAMD.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedAMD2.types b/tests/baselines/reference/importCallExpressionNestedAMD2.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedAMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedAMD2.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS.types b/tests/baselines/reference/importCallExpressionNestedCJS.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS.types
+++ b/tests/baselines/reference/importCallExpressionNestedCJS.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedCJS2.types b/tests/baselines/reference/importCallExpressionNestedCJS2.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedCJS2.types
+++ b/tests/baselines/reference/importCallExpressionNestedCJS2.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES2015.types b/tests/baselines/reference/importCallExpressionNestedES2015.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedES2015.types
+++ b/tests/baselines/reference/importCallExpressionNestedES2015.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedES20152.types b/tests/baselines/reference/importCallExpressionNestedES20152.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedES20152.types
+++ b/tests/baselines/reference/importCallExpressionNestedES20152.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext.types b/tests/baselines/reference/importCallExpressionNestedESNext.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext.types
+++ b/tests/baselines/reference/importCallExpressionNestedESNext.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedESNext2.types b/tests/baselines/reference/importCallExpressionNestedESNext2.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedESNext2.types
+++ b/tests/baselines/reference/importCallExpressionNestedESNext2.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem.types b/tests/baselines/reference/importCallExpressionNestedSystem.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedSystem2.types b/tests/baselines/reference/importCallExpressionNestedSystem2.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedSystem2.types
+++ b/tests/baselines/reference/importCallExpressionNestedSystem2.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD.types b/tests/baselines/reference/importCallExpressionNestedUMD.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNestedUMD2.types b/tests/baselines/reference/importCallExpressionNestedUMD2.types
index 2f74d78b6c845..1e23832e30522 100644
--- a/tests/baselines/reference/importCallExpressionNestedUMD2.types
+++ b/tests/baselines/reference/importCallExpressionNestedUMD2.types
@@ -9,9 +9,9 @@ async function foo() {
 >await import((await import("./foo")).default) : any
 >import((await import("./foo")).default) : Promise<any>
 >(await import("./foo")).default : "./foo"
->(await import("./foo")) : typeof "tests/cases/conformance/dynamicImport/foo"
->await import("./foo") : typeof "tests/cases/conformance/dynamicImport/foo"
->import("./foo") : Promise<typeof "tests/cases/conformance/dynamicImport/foo">
+>(await import("./foo")) : typeof import("tests/cases/conformance/dynamicImport/foo")
+>await import("./foo") : typeof import("tests/cases/conformance/dynamicImport/foo")
+>import("./foo") : Promise<typeof import("tests/cases/conformance/dynamicImport/foo")>
 >"./foo" : "./foo"
 >default : "./foo"
 }
diff --git a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
index 552e3cf9206ca..ef8cdaec2fa72 100644
--- a/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
+++ b/tests/baselines/reference/importCallExpressionNoModuleKindSpecified.types
@@ -24,27 +24,27 @@ class C {
 >C : C
 
     private myModule = import("./0");
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
     method() {
 >method : () => void
 
         const loadAsync = import("./0");
->loadAsync : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>loadAsync : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
         this.myModule.then(Zero => {
 >this.myModule.then(Zero => {            console.log(Zero.foo());        }, async err => {            console.log(err);            let one = await import("./1");            console.log(one.backup());        }) : Promise<void>
->this.myModule.then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->this.myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>this.myModule.then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>this.myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >this : this
->myModule : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->then : <TResult1 = typeof "tests/cases/conformance/dynamicImport/0", TResult2 = never>(onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
->Zero => {            console.log(Zero.foo());        } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>myModule : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>then : <TResult1 = typeof import("tests/cases/conformance/dynamicImport/0"), TResult2 = never>(onfulfilled?: (value: typeof import("tests/cases/conformance/dynamicImport/0")) => TResult1 | PromiseLike<TResult1>, onrejected?: (reason: any) => TResult2 | PromiseLike<TResult2>) => Promise<TResult1 | TResult2>
+>Zero => {            console.log(Zero.foo());        } : (Zero: typeof import("tests/cases/conformance/dynamicImport/0")) => void
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 
             console.log(Zero.foo());
 >console.log(Zero.foo()) : any
@@ -53,7 +53,7 @@ class C {
 >log : any
 >Zero.foo() : string
 >Zero.foo : () => string
->Zero : typeof "tests/cases/conformance/dynamicImport/0"
+>Zero : typeof import("tests/cases/conformance/dynamicImport/0")
 >foo : () => string
 
         }, async err => {
@@ -68,9 +68,9 @@ class C {
 >err : any
 
             let one = await import("./1");
->one : typeof "tests/cases/conformance/dynamicImport/1"
->await import("./1") : typeof "tests/cases/conformance/dynamicImport/1"
->import("./1") : Promise<typeof "tests/cases/conformance/dynamicImport/1">
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
+>await import("./1") : typeof import("tests/cases/conformance/dynamicImport/1")
+>import("./1") : Promise<typeof import("tests/cases/conformance/dynamicImport/1")>
 >"./1" : "./1"
 
             console.log(one.backup());
@@ -80,7 +80,7 @@ class C {
 >log : any
 >one.backup() : string
 >one.backup : () => string
->one : typeof "tests/cases/conformance/dynamicImport/1"
+>one : typeof import("tests/cases/conformance/dynamicImport/1")
 >backup : () => string
 
         });
diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.types b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
index d228ae7c95ddc..123215a865608 100644
--- a/tests/baselines/reference/importCallExpressionWithTypeArgument.types
+++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.types
@@ -8,13 +8,13 @@ export function foo() { return "foo"; }
 >"use strict" : "use strict"
 
 var p1 = import<Promise<any>>("./0");  // error
->p1 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import<Promise<any>>("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p1 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import<Promise<any>>("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >Promise : Promise<T>
 >"./0" : "./0"
 
 var p2 = import<>("./0");  // error
->p2 : Promise<typeof "tests/cases/conformance/dynamicImport/0">
->import<>("./0") : Promise<typeof "tests/cases/conformance/dynamicImport/0">
+>p2 : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
+>import<>("./0") : Promise<typeof import("tests/cases/conformance/dynamicImport/0")>
 >"./0" : "./0"
 
diff --git a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
index 1721f8cdfe300..21f7d4f05b411 100644
--- a/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithDeclareModifierInAmbientContext.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importDeclWithDeclareModifierInAmbientContext.ts ===
 declare module "m" {
->"m" : typeof "m"
+>"m" : typeof import("m")
 
     module x {
 >x : any
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
index 7ba42021954fa..80f9ba8530343 100644
--- a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignmentInAmbientContext.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importDeclWithExportModifierAndExportAssignmentInAmbientContext.ts ===
 declare module "m" {
->"m" : typeof "m"
+>"m" : typeof import("m")
 
     module x {
 >x : any
diff --git a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
index 4818b04acb4a3..82244ad18b099 100644
--- a/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
+++ b/tests/baselines/reference/importDeclWithExportModifierInAmbientContext.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/importDeclWithExportModifierInAmbientContext.ts ===
 declare module "m" {
->"m" : typeof "m"
+>"m" : typeof import("m")
 
     module x {
 >x : any
diff --git a/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types b/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
index 2531654f80b92..c12cd511cb9d9 100644
--- a/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
+++ b/tests/baselines/reference/importShouldNotBeElidedInDeclarationEmit.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/node_modules/umd.d.ts ===
 export as namespace UMD;
->UMD : typeof "tests/cases/compiler/node_modules/umd"
+>UMD : typeof import("tests/cases/compiler/node_modules/umd")
 
 export type Thing = {
 >Thing : Thing
diff --git a/tests/baselines/reference/importTsBeforeDTs.errors.txt b/tests/baselines/reference/importTsBeforeDTs.errors.txt
index aaee4e3d07085..373b191f5962e 100644
--- a/tests/baselines/reference/importTsBeforeDTs.errors.txt
+++ b/tests/baselines/reference/importTsBeforeDTs.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/externalModules/foo_1.ts(2,14): error TS2339: Property 'x' does not exist on type 'typeof "tests/cases/conformance/externalModules/foo_0"'.
+tests/cases/conformance/externalModules/foo_1.ts(2,14): error TS2339: Property 'x' does not exist on type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
     import foo = require("./foo_0");
     var z1 = foo.x + 10;   // Should error, as .ts preferred over .d.ts
                  ~
-!!! error TS2339: Property 'x' does not exist on type 'typeof "tests/cases/conformance/externalModules/foo_0"'.
+!!! error TS2339: Property 'x' does not exist on type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
     var z2 = foo.y + 10; // Should resolve
     
 ==== tests/cases/conformance/externalModules/foo_0.d.ts (0 errors) ====
diff --git a/tests/baselines/reference/importTypeAmbient.types b/tests/baselines/reference/importTypeAmbient.types
index d7b7399d28d7b..bfa3c1b4ef4c7 100644
--- a/tests/baselines/reference/importTypeAmbient.types
+++ b/tests/baselines/reference/importTypeAmbient.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/import/importTypeAmbient.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     interface Point {
 >Point : Point
@@ -23,7 +23,7 @@ const x: import("foo") = { x: 0, y: 0 };
 >0 : 0
 
 declare module "foo2" {
->"foo2" : typeof "foo2"
+>"foo2" : typeof import("foo2")
 
     namespace Bar {
 >Bar : typeof Bar
@@ -92,7 +92,7 @@ class Bar2 {
 }
 
 let shim: typeof import("foo2") = {
->shim : typeof "foo2"
+>shim : typeof import("foo2")
 >{    Bar: Bar2} : { Bar: typeof Bar2; }
 
     Bar: Bar2
diff --git a/tests/baselines/reference/importTypeAmbientMissing.types b/tests/baselines/reference/importTypeAmbientMissing.types
index 975f0f83a7b63..b9da468146e23 100644
--- a/tests/baselines/reference/importTypeAmbientMissing.types
+++ b/tests/baselines/reference/importTypeAmbientMissing.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/types/import/importTypeAmbientMissing.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/importTypeLocal.types b/tests/baselines/reference/importTypeLocal.types
index 8969260819d71..955a3a6bf46bc 100644
--- a/tests/baselines/reference/importTypeLocal.types
+++ b/tests/baselines/reference/importTypeLocal.types
@@ -89,7 +89,7 @@ export class Bar2 {
 }
 
 export let shim: typeof import("./foo2") = {
->shim : typeof "tests/cases/conformance/types/import/foo2"
+>shim : typeof import("tests/cases/conformance/types/import/foo2")
 >{    Bar: Bar2} : { Bar: typeof Bar2; }
 
     Bar: Bar2
diff --git a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
index 986c65ca0fe2c..cd36e8deed34a 100644
--- a/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
+++ b/tests/baselines/reference/import_unneeded-require-when-referenecing-aliased-type-throug-array.types
@@ -17,7 +17,7 @@ var p = testData[0].name;
  
 === tests/cases/compiler/b.ts ===
 declare module "ITest" {
->"ITest" : typeof "ITest"
+>"ITest" : typeof import("ITest")
 
     interface Name {
 >Name : Name
diff --git a/tests/baselines/reference/importsInAmbientModules1.types b/tests/baselines/reference/importsInAmbientModules1.types
index e0775f26ca5c0..b6279a69d563e 100644
--- a/tests/baselines/reference/importsInAmbientModules1.types
+++ b/tests/baselines/reference/importsInAmbientModules1.types
@@ -4,7 +4,7 @@ export var x: number
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     import {x} from "external"
 >x : number
diff --git a/tests/baselines/reference/importsInAmbientModules2.types b/tests/baselines/reference/importsInAmbientModules2.types
index 344c7ed87f030..275debe07aa71 100644
--- a/tests/baselines/reference/importsInAmbientModules2.types
+++ b/tests/baselines/reference/importsInAmbientModules2.types
@@ -4,7 +4,7 @@ export default class C {}
 
 === tests/cases/compiler/main.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     import C from "external"
 >C : typeof C
diff --git a/tests/baselines/reference/importsInAmbientModules3.types b/tests/baselines/reference/importsInAmbientModules3.types
index cecc08cf09b9b..e02f7431d7888 100644
--- a/tests/baselines/reference/importsInAmbientModules3.types
+++ b/tests/baselines/reference/importsInAmbientModules3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/main.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     import C = require("external");
 >C : typeof C
diff --git a/tests/baselines/reference/incompatibleExports1.types b/tests/baselines/reference/incompatibleExports1.types
index 3d3acd936d64d..1d49dcfbd9b63 100644
--- a/tests/baselines/reference/incompatibleExports1.types
+++ b/tests/baselines/reference/incompatibleExports1.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/incompatibleExports1.ts ===
 declare module "foo" { 
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export interface x { a: string } 
 >x : x
@@ -16,7 +16,7 @@ declare module "foo" {
 }
  
 declare module "baz" {
->"baz" : typeof "baz"
+>"baz" : typeof import("baz")
 
     export module a {
 >a : typeof a
diff --git a/tests/baselines/reference/incompatibleExports2.types b/tests/baselines/reference/incompatibleExports2.types
index 554f6ce2583e1..419bf552f32aa 100644
--- a/tests/baselines/reference/incompatibleExports2.types
+++ b/tests/baselines/reference/incompatibleExports2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/incompatibleExports2.ts ===
 declare module "foo" { 
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export interface x { a: string } 
 >x : x
diff --git a/tests/baselines/reference/jsFileCompilationExternalPackageError.types b/tests/baselines/reference/jsFileCompilationExternalPackageError.types
index 82418aeeb2801..269d8f5cf9d1e 100644
--- a/tests/baselines/reference/jsFileCompilationExternalPackageError.types
+++ b/tests/baselines/reference/jsFileCompilationExternalPackageError.types
@@ -22,7 +22,7 @@ var a = 10;
 exports.a = 10;
 >exports.a = 10 : 10
 >exports.a : number
->exports : typeof "tests/cases/compiler/node_modules/c"
+>exports : typeof import("tests/cases/compiler/node_modules/c")
 >a : number
 >10 : 10
 
diff --git a/tests/baselines/reference/jsxImportInAttribute.types b/tests/baselines/reference/jsxImportInAttribute.types
index 1b774110e6d8a..92997d99399af 100644
--- a/tests/baselines/reference/jsxImportInAttribute.types
+++ b/tests/baselines/reference/jsxImportInAttribute.types
@@ -15,7 +15,7 @@ let x = Test; // emit test_1.default
 
 === tests/cases/compiler/component.d.ts ===
 declare module "Test" {
->"Test" : typeof "Test"
+>"Test" : typeof import("Test")
 
 	export default class Text { }
 >Text : Text
diff --git a/tests/baselines/reference/jsxViaImport.2.types b/tests/baselines/reference/jsxViaImport.2.types
index 2d2e3bb32bce3..6bfbd8ca31a4c 100644
--- a/tests/baselines/reference/jsxViaImport.2.types
+++ b/tests/baselines/reference/jsxViaImport.2.types
@@ -35,7 +35,7 @@ declare module React {
 >U : U
 }
 declare module "BaseComponent" {
->"BaseComponent" : typeof "BaseComponent"
+>"BaseComponent" : typeof import("BaseComponent")
 
     export default class extends React.Component<any, {}> {
 >React.Component : React.Component<any, {}>
diff --git a/tests/baselines/reference/jsxViaImport.types b/tests/baselines/reference/jsxViaImport.types
index 17f594536c0a9..b9061e0b7c26f 100644
--- a/tests/baselines/reference/jsxViaImport.types
+++ b/tests/baselines/reference/jsxViaImport.types
@@ -35,7 +35,7 @@ declare module React {
 >U : U
 }
 declare module "BaseComponent" {
->"BaseComponent" : typeof "BaseComponent"
+>"BaseComponent" : typeof import("BaseComponent")
 
     var base: React.Component<any, {}>;
 >base : React.Component<any, {}>
diff --git a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.errors.txt b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.errors.txt
index e9455a4efbd2f..edb5e32151f1f 100644
--- a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.errors.txt
+++ b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.errors.txt
@@ -1,4 +1,4 @@
-/index.ts(4,5): error TS2339: Property 'y' does not exist on type 'typeof "shortid"'.
+/index.ts(4,5): error TS2339: Property 'y' does not exist on type 'typeof import("shortid")'.
 
 
 ==== /tsconfig.json (0 errors) ====
@@ -17,7 +17,7 @@
     foo.x // found in index.d.ts
     foo.y // ignored from shortid/index.js
         ~
-!!! error TS2339: Property 'y' does not exist on type 'typeof "shortid"'.
+!!! error TS2339: Property 'y' does not exist on type 'typeof import("shortid")'.
     
     
 ==== /node_modules/shortid/node_modules/z/index.js (0 errors) ====
diff --git a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
index 0dfbbb9877f8d..30815e07f5e89 100644
--- a/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
+++ b/tests/baselines/reference/maxNodeModuleJsDepthDefaultsToZero.types
@@ -16,7 +16,7 @@ foo.y // ignored from shortid/index.js
 
 === /typings/index.d.ts ===
 declare module "shortid" {
->"shortid" : typeof "shortid"
+>"shortid" : typeof import("shortid")
 
     export var x: number;
 >x : number
diff --git a/tests/baselines/reference/mergedDeclarations6.types b/tests/baselines/reference/mergedDeclarations6.types
index 89c0d0f4997ae..3b2b5a8d512c2 100644
--- a/tests/baselines/reference/mergedDeclarations6.types
+++ b/tests/baselines/reference/mergedDeclarations6.types
@@ -23,7 +23,7 @@ import {A} from './a';
 >A : typeof A
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A { }
 >A : A
diff --git a/tests/baselines/reference/missingFunctionImplementation2.types b/tests/baselines/reference/missingFunctionImplementation2.types
index 2eae6187560f0..640a7aaecb0a7 100644
--- a/tests/baselines/reference/missingFunctionImplementation2.types
+++ b/tests/baselines/reference/missingFunctionImplementation2.types
@@ -1,7 +1,7 @@
 === tests/cases/compiler/missingFunctionImplementation2_a.ts ===
 export {};
 declare module "./missingFunctionImplementation2_b" {
->"./missingFunctionImplementation2_b" : typeof "tests/cases/compiler/missingFunctionImplementation2_b"
+>"./missingFunctionImplementation2_b" : typeof import("tests/cases/compiler/missingFunctionImplementation2_b")
 
   export function f(a, b): void;
 >f : { (a?: any, b?: any): any; (a: any, b: any): void; }
diff --git a/tests/baselines/reference/missingImportAfterModuleImport.types b/tests/baselines/reference/missingImportAfterModuleImport.types
index 3af7f2b179506..c6c1fb265e069 100644
--- a/tests/baselines/reference/missingImportAfterModuleImport.types
+++ b/tests/baselines/reference/missingImportAfterModuleImport.types
@@ -19,7 +19,7 @@ export = MainModule;
 
 === tests/cases/compiler/missingImportAfterModuleImport_0.ts ===
 declare module "SubModule" {
->"SubModule" : typeof "SubModule"
+>"SubModule" : typeof import("SubModule")
 
     class SubModule {
 >SubModule : SubModule
diff --git a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
index 14a155b2035cb..5729746cbb17a 100644
--- a/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
+++ b/tests/baselines/reference/moduleAugmentationCollidingNamesInAugmentation1.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface I {x0}
 >I : I
@@ -37,7 +37,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface I {x1}
 >I : I
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
index 4818543dc857b..e16188eaf6b36 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit1.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
index fc0cbc5c8df05..ea8d2c69c9b9a 100644
--- a/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
+++ b/tests/baselines/reference/moduleAugmentationDeclarationEmit2.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
index a179b0e06565b..0674941e2577a 100644
--- a/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
+++ b/tests/baselines/reference/moduleAugmentationDisallowedExtensions.types
@@ -13,7 +13,7 @@ namespace N1 {
 }
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     var x: number;
 >x : number
@@ -72,7 +72,7 @@ declare module "./observable" {
 }
 
 declare module "./test" {
->"./test" : typeof "tests/cases/compiler/test"
+>"./test" : typeof import("tests/cases/compiler/test")
 
     export = N1;
 >N1 : typeof N1
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
index 408429076c4a3..b2586292b1214 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule1.types
@@ -37,7 +37,7 @@ import { Observable } from "observable"
 >function() { } : () => void
 
 declare module "observable" {
->"observable" : typeof "observable"
+>"observable" : typeof import("observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
@@ -63,7 +63,7 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
->"observable" : typeof "observable"
+>"observable" : typeof import("observable")
 
     class Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
index b81ac9dba6966..f40b395bb06ac 100644
--- a/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendAmbientModule2.types
@@ -55,7 +55,7 @@ import { Observable } from "observable"
 >function() { } : () => void
 
 declare module "observable" {
->"observable" : typeof "observable"
+>"observable" : typeof import("observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
@@ -81,7 +81,7 @@ declare module "observable" {
 
 === tests/cases/compiler/observable.d.ts ===
 declare module "observable" {
->"observable" : typeof "observable"
+>"observable" : typeof import("observable")
 
     class Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
index 4818543dc857b..e16188eaf6b36 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule1.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
index fc0cbc5c8df05..ea8d2c69c9b9a 100644
--- a/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
+++ b/tests/baselines/reference/moduleAugmentationExtendFileModule2.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationGlobal5.types b/tests/baselines/reference/moduleAugmentationGlobal5.types
index a7a24f1dbceaa..c43a6b454ac7a 100644
--- a/tests/baselines/reference/moduleAugmentationGlobal5.types
+++ b/tests/baselines/reference/moduleAugmentationGlobal5.types
@@ -7,7 +7,7 @@ No type information for this code.
 No type information for this code.
 No type information for this code.=== tests/cases/compiler/f1.d.ts ===
 declare module "A" {
->"A" : typeof "A"
+>"A" : typeof import("A")
 
     global {
 >global : any
@@ -19,7 +19,7 @@ declare module "A" {
 }
 === tests/cases/compiler/f2.d.ts ===
 declare module "B" {
->"B" : typeof "B"
+>"B" : typeof import("B")
 
     global {
 >global : any
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
index f210ce5cdc533..8315676d230b1 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports1.types
@@ -28,7 +28,7 @@ A.prototype.foo = function () { return undefined; }
 >undefined : undefined
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
index 22ae1b1e79fa9..a2340092e5275 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports2.types
@@ -37,7 +37,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     import {B} from "./f2";
 >B : typeof B
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
index de54c32c22be1..088ffc66c58fc 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports3.types
@@ -37,7 +37,7 @@ namespace N {
 }
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     import {B} from "./f2";
 >B : typeof B
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
index fdda015987adf..771731ecdb38c 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports4.types
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
index fdda015987adf..771731ecdb38c 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports5.types
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
index 5631272a77610..4457aefb78dc2 100644
--- a/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
+++ b/tests/baselines/reference/moduleAugmentationImportsAndExports6.types
@@ -49,7 +49,7 @@ import C = N.Cls;
 >Cls : C
 
 declare module "./f1" {
->"./f1" : typeof "tests/cases/compiler/f1"
+>"./f1" : typeof import("tests/cases/compiler/f1")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
index a5de2d5e0c971..428df933b131d 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule1.types
@@ -18,14 +18,14 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     class Cls { x: number }
 >Cls : Cls
@@ -33,13 +33,13 @@ declare module "M" {
 }
 
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
index bc43861af8934..190a8d568b3c6 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule2.types
@@ -19,14 +19,14 @@ x.foo().x;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     class Cls { x: number }
 >Cls : Cls
@@ -34,13 +34,13 @@ declare module "M" {
 }
 
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
index e2f336101cb49..06efc3c4e869a 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule3.types
@@ -27,14 +27,14 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     class Cls { x: number }
 >Cls : Cls
@@ -42,13 +42,13 @@ declare module "M" {
 }
 
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
@@ -61,14 +61,14 @@ declare module "Map" {
 }
 
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     class Cls2 { x2: number }
 >Cls2 : Cls2
 >x2 : number
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
index e6b6b522784ef..bdb2501ac8c0a 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule4.types
@@ -28,14 +28,14 @@ x.foo2().x2;
 
 === tests/cases/compiler/O.d.ts ===
 declare module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
     class Observable {}
 >Observable : Observable
 }
 
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     class Cls { x: number }
 >Cls : Cls
@@ -43,13 +43,13 @@ declare module "M" {
 }
 
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     import { Cls } from "M";
 >Cls : typeof Cls
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
@@ -63,14 +63,14 @@ declare module "Map" {
 
 === tests/cases/compiler/O2.d.ts ===
 declare module "Map" {
->"Map" : typeof "Map"
+>"Map" : typeof import("Map")
 
     class Cls2 { x2: number }
 >Cls2 : Cls2
 >x2 : number
 
     module "Observable" {
->"Observable" : typeof "Observable"
+>"Observable" : typeof import("Observable")
 
         interface Observable {
 >Observable : Observable
diff --git a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
index a0ccf73fbc41b..82649bd9a6b7c 100644
--- a/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
+++ b/tests/baselines/reference/moduleAugmentationInAmbientModule5.types
@@ -18,7 +18,7 @@ let y = x.getA().x;
 
 === tests/cases/compiler/array.d.ts ===
 declare module "A" {
->"A" : typeof "A"
+>"A" : typeof import("A")
 
     class A { x: number; }
 >A : A
@@ -26,7 +26,7 @@ declare module "A" {
 }
 
 declare module "array" {
->"array" : typeof "array"
+>"array" : typeof import("array")
 
     import {A} from "A";
 >A : typeof A
diff --git a/tests/baselines/reference/moduleAugmentationNoNewNames.types b/tests/baselines/reference/moduleAugmentationNoNewNames.types
index 5fb6b32ce405a..08bef8ee6e5b5 100644
--- a/tests/baselines/reference/moduleAugmentationNoNewNames.types
+++ b/tests/baselines/reference/moduleAugmentationNoNewNames.types
@@ -14,7 +14,7 @@ import { Observable } from "./observable"
 >function() { } : () => void
 
 declare module "./observable" {
->"./observable" : typeof "tests/cases/compiler/observable"
+>"./observable" : typeof import("tests/cases/compiler/observable")
 
     interface Observable<T> {
 >Observable : Observable<T>
diff --git a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
index 7199fd26c0845..6c5ebdccdc34b 100644
--- a/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
+++ b/tests/baselines/reference/moduleAugmentationsBundledOutput1.types
@@ -32,7 +32,7 @@ import {Cls} from "./m1";
 >"1" : "1"
 
 declare module "./m1" {
->"./m1" : typeof "tests/cases/compiler/m1"
+>"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
 >Cls : Cls
@@ -43,7 +43,7 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
->"./m1" : typeof "tests/cases/compiler/m1"
+>"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
 >Cls : Cls
@@ -95,7 +95,7 @@ import {C1, C2} from "./m3";
 >undefined : undefined
 
 declare module "./m1" {
->"./m1" : typeof "tests/cases/compiler/m1"
+>"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
 >Cls : Cls
@@ -107,7 +107,7 @@ declare module "./m1" {
 }
 
 declare module "./m1" {
->"./m1" : typeof "tests/cases/compiler/m1"
+>"./m1" : typeof import("tests/cases/compiler/m1")
 
     interface Cls {
 >Cls : Cls
diff --git a/tests/baselines/reference/moduleAugmentationsImports1.types b/tests/baselines/reference/moduleAugmentationsImports1.types
index 1ad997647f431..9df5d5b72d4c9 100644
--- a/tests/baselines/reference/moduleAugmentationsImports1.types
+++ b/tests/baselines/reference/moduleAugmentationsImports1.types
@@ -9,7 +9,7 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
->"C" : typeof "C"
+>"C" : typeof import("C")
 
     class Cls {y: string; }
 >Cls : Cls
@@ -49,7 +49,7 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
@@ -61,7 +61,7 @@ declare module "./a" {
 }
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationsImports2.types b/tests/baselines/reference/moduleAugmentationsImports2.types
index e331dbc405480..c94186c670adc 100644
--- a/tests/baselines/reference/moduleAugmentationsImports2.types
+++ b/tests/baselines/reference/moduleAugmentationsImports2.types
@@ -9,7 +9,7 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
->"C" : typeof "C"
+>"C" : typeof import("C")
 
     class Cls {y: string; }
 >Cls : Cls
@@ -36,7 +36,7 @@ A.prototype.getB = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
@@ -65,7 +65,7 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationsImports3.types b/tests/baselines/reference/moduleAugmentationsImports3.types
index eb460364caabc..549885a3e0db8 100644
--- a/tests/baselines/reference/moduleAugmentationsImports3.types
+++ b/tests/baselines/reference/moduleAugmentationsImports3.types
@@ -45,7 +45,7 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
->"C" : typeof "C"
+>"C" : typeof import("C")
 
     class Cls {y: string; }
 >Cls : Cls
@@ -54,7 +54,7 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
->"D" : typeof "D"
+>"D" : typeof import("D")
 
     import {A} from "a";
 >A : typeof A
@@ -63,7 +63,7 @@ declare module "D" {
 >B : typeof B
 
     module "a" {
->"a" : typeof "tests/cases/compiler/a"
+>"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
 >A : A
@@ -94,7 +94,7 @@ A.prototype.getCls = function () { return undefined; }
 >undefined : undefined
 
 declare module "./a" {
->"./a" : typeof "tests/cases/compiler/a"
+>"./a" : typeof import("tests/cases/compiler/a")
 
     interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleAugmentationsImports4.types b/tests/baselines/reference/moduleAugmentationsImports4.types
index db56fa15aecd7..530cc5d561915 100644
--- a/tests/baselines/reference/moduleAugmentationsImports4.types
+++ b/tests/baselines/reference/moduleAugmentationsImports4.types
@@ -46,7 +46,7 @@ export class B {x: number;}
 
 === tests/cases/compiler/c.d.ts ===
 declare module "C" {
->"C" : typeof "C"
+>"C" : typeof import("C")
 
     class Cls {y: string; }
 >Cls : Cls
@@ -55,7 +55,7 @@ declare module "C" {
 
 === tests/cases/compiler/d.d.ts ===
 declare module "D" {
->"D" : typeof "D"
+>"D" : typeof import("D")
 
     import {A} from "a";
 >A : typeof A
@@ -64,7 +64,7 @@ declare module "D" {
 >B : typeof B
 
     module "a" {
->"a" : typeof "tests/cases/compiler/a"
+>"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
 >A : A
@@ -79,7 +79,7 @@ declare module "D" {
 === tests/cases/compiler/e.d.ts ===
 /// <reference path="c.d.ts"/>
 declare module "E" {
->"E" : typeof "E"
+>"E" : typeof import("E")
 
     import {A} from "a";
 >A : typeof A
@@ -88,7 +88,7 @@ declare module "E" {
 >Cls : typeof Cls
 
     module "a" {
->"a" : typeof "tests/cases/compiler/a"
+>"a" : typeof import("tests/cases/compiler/a")
 
         interface A {
 >A : A
diff --git a/tests/baselines/reference/moduleElementsInWrongContext2.types b/tests/baselines/reference/moduleElementsInWrongContext2.types
index 1f5ead892358d..14b723b37d2ed 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext2.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext2.types
@@ -17,7 +17,7 @@ function blah () {
 >K : any
 
     declare module "ambient" {
->"ambient" : typeof "ambient"
+>"ambient" : typeof import("ambient")
 
     }
 
diff --git a/tests/baselines/reference/moduleElementsInWrongContext3.types b/tests/baselines/reference/moduleElementsInWrongContext3.types
index 86dfa2ddc22e1..b11e9d57231a4 100644
--- a/tests/baselines/reference/moduleElementsInWrongContext3.types
+++ b/tests/baselines/reference/moduleElementsInWrongContext3.types
@@ -17,7 +17,7 @@ module P {
 >K : any
 
         declare module "ambient" {
->"ambient" : typeof "ambient"
+>"ambient" : typeof import("ambient")
 
         }
 
diff --git a/tests/baselines/reference/moduleExportAlias.types b/tests/baselines/reference/moduleExportAlias.types
index b1eedf8c2ab1a..ce4e1a8fe7324 100644
--- a/tests/baselines/reference/moduleExportAlias.types
+++ b/tests/baselines/reference/moduleExportAlias.types
@@ -105,20 +105,20 @@ b.func20;
 
 === tests/cases/conformance/salsa/b.js ===
 var exportsAlias = exports;
->exportsAlias : typeof "tests/cases/conformance/salsa/b"
->exports : typeof "tests/cases/conformance/salsa/b"
+>exportsAlias : typeof import("tests/cases/conformance/salsa/b")
+>exports : typeof import("tests/cases/conformance/salsa/b")
 
 exportsAlias.func1 = function () { };
 >exportsAlias.func1 = function () { } : () => void
 >exportsAlias.func1 : () => void
->exportsAlias : typeof "tests/cases/conformance/salsa/b"
+>exportsAlias : typeof import("tests/cases/conformance/salsa/b")
 >func1 : () => void
 >function () { } : () => void
 
 exports.func2 = function () { };
 >exports.func2 = function () { } : () => void
 >exports.func2 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func2 : () => void
 >function () { } : () => void
 
@@ -160,17 +160,17 @@ multipleDeclarationAlias1.func5 = function () { };
 >function () { } : () => void
 
 var multipleDeclarationAlias2 = module.exports = exports;
->multipleDeclarationAlias2 : typeof "tests/cases/conformance/salsa/b"
->module.exports = exports : typeof "tests/cases/conformance/salsa/b"
+>multipleDeclarationAlias2 : typeof import("tests/cases/conformance/salsa/b")
+>module.exports = exports : typeof import("tests/cases/conformance/salsa/b")
 >module.exports : any
 >module : any
 >exports : any
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 
 multipleDeclarationAlias2.func6 = function () { };
 >multipleDeclarationAlias2.func6 = function () { } : () => void
 >multipleDeclarationAlias2.func6 : () => void
->multipleDeclarationAlias2 : typeof "tests/cases/conformance/salsa/b"
+>multipleDeclarationAlias2 : typeof import("tests/cases/conformance/salsa/b")
 >func6 : () => void
 >function () { } : () => void
 
@@ -178,15 +178,15 @@ var someOtherVariable;
 >someOtherVariable : any
 
 var multipleDeclarationAlias3 = someOtherVariable = exports;
->multipleDeclarationAlias3 : typeof "tests/cases/conformance/salsa/b"
->someOtherVariable = exports : typeof "tests/cases/conformance/salsa/b"
+>multipleDeclarationAlias3 : typeof import("tests/cases/conformance/salsa/b")
+>someOtherVariable = exports : typeof import("tests/cases/conformance/salsa/b")
 >someOtherVariable : any
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 
 multipleDeclarationAlias3.func7 = function () { };
 >multipleDeclarationAlias3.func7 = function () { } : () => void
 >multipleDeclarationAlias3.func7 : () => void
->multipleDeclarationAlias3 : typeof "tests/cases/conformance/salsa/b"
+>multipleDeclarationAlias3 : typeof import("tests/cases/conformance/salsa/b")
 >func7 : () => void
 >function () { } : () => void
 
@@ -253,7 +253,7 @@ exports = module.exports = someOtherVariable = {};
 exports.func11 = function () { };
 >exports.func11 = function () { } : () => void
 >exports.func11 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func11 : () => void
 >function () { } : () => void
 
@@ -280,7 +280,7 @@ exports = module.exports = someOtherVariable = {};
 exports.func11 = function () { };
 >exports.func11 = function () { } : () => void
 >exports.func11 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func11 : () => void
 >function () { } : () => void
 
@@ -305,7 +305,7 @@ exports = module.exports = {};
 exports.func13 = function () { };
 >exports.func13 = function () { } : () => void
 >exports.func13 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func13 : () => void
 >function () { } : () => void
 
@@ -330,7 +330,7 @@ exports = module.exports = {};
 exports.func15 = function () { };
 >exports.func15 = function () { } : () => void
 >exports.func15 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func15 : () => void
 >function () { } : () => void
 
@@ -355,7 +355,7 @@ module.exports = exports = {};
 exports.func17 = function () { };
 >exports.func17 = function () { } : () => void
 >exports.func17 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func17 : () => void
 >function () { } : () => void
 
@@ -378,7 +378,7 @@ module.exports = {};
 exports.func19 = function () { };
 >exports.func19 = function () { } : () => void
 >exports.func19 : () => void
->exports : typeof "tests/cases/conformance/salsa/b"
+>exports : typeof import("tests/cases/conformance/salsa/b")
 >func19 : () => void
 >function () { } : () => void
 
diff --git a/tests/baselines/reference/moduleMergeConstructor.types b/tests/baselines/reference/moduleMergeConstructor.types
index b7e61da4687d2..9cc599b99a149 100644
--- a/tests/baselines/reference/moduleMergeConstructor.types
+++ b/tests/baselines/reference/moduleMergeConstructor.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/foo.d.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export class Foo {
 >Foo : Foo
@@ -13,7 +13,7 @@ declare module "foo" {
 
 === tests/cases/compiler/foo-ext.d.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export interface Foo {
 >Foo : Foo
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
index 23c4b4164e7a8..427dd62b2881d 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
+++ b/tests/baselines/reference/moduleResolutionWithExtensions_withAmbientPresent.types
@@ -5,7 +5,7 @@ import { x } from "js";
 
 === /declarations.d.ts ===
 declare module "js" {
->"js" : typeof "js"
+>"js" : typeof import("js")
 
     export const x = 0;
 >x : 0
diff --git a/tests/baselines/reference/moduleResolution_explicitNodeModulesImport.types b/tests/baselines/reference/moduleResolution_explicitNodeModulesImport.types
index fe7d74c914c87..fabd2b69a4c82 100644
--- a/tests/baselines/reference/moduleResolution_explicitNodeModulesImport.types
+++ b/tests/baselines/reference/moduleResolution_explicitNodeModulesImport.types
@@ -6,7 +6,7 @@ import { x } from "../node_modules/foo";
 exports.x = 0;
 >exports.x = 0 : 0
 >exports.x : number
->exports : typeof "/node_modules/foo/index"
+>exports : typeof import("/node_modules/foo/index")
 >x : number
 >0 : 0
 
diff --git a/tests/baselines/reference/module_augmentUninstantiatedModule.types b/tests/baselines/reference/module_augmentUninstantiatedModule.types
index 1fad9ee86091f..dc887b4b17f9a 100644
--- a/tests/baselines/reference/module_augmentUninstantiatedModule.types
+++ b/tests/baselines/reference/module_augmentUninstantiatedModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/module_augmentUninstantiatedModule.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
    namespace M {}
 >M : any
@@ -13,7 +13,7 @@ declare module "foo" {
 }
 
 declare module "bar" {
->"bar" : typeof "bar"
+>"bar" : typeof import("bar")
 
     module "foo" {}
 >"foo" : any
diff --git a/tests/baselines/reference/moduledecl.types b/tests/baselines/reference/moduledecl.types
index 567ef6b8c5417..3268e10771a1b 100644
--- a/tests/baselines/reference/moduledecl.types
+++ b/tests/baselines/reference/moduledecl.types
@@ -303,7 +303,7 @@ declare module m55 {
 }
 
 declare module "m3" {
->"m3" : typeof "m3"
+>"m3" : typeof import("m3")
 
     export var b: number;
 >b : number
diff --git a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
index ae94289f7100d..2f7cebd95a0dc 100644
--- a/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
+++ b/tests/baselines/reference/multipleExportAssignmentsInAmbientDeclaration.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/multipleExportAssignmentsInAmbientDeclaration.ts ===
 declare module "m1" {
->"m1" : typeof "m1"
+>"m1" : typeof import("m1")
 
     var a: number
 >a : number
diff --git a/tests/baselines/reference/nodeResolution5.types b/tests/baselines/reference/nodeResolution5.types
index 453f5c319ee83..3cd5d2dd631a4 100644
--- a/tests/baselines/reference/nodeResolution5.types
+++ b/tests/baselines/reference/nodeResolution5.types
@@ -4,7 +4,7 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a.d.ts ===
 declare module "a" {
->"a" : typeof "a"
+>"a" : typeof import("a")
 
     var x: number;
 >x : number
diff --git a/tests/baselines/reference/nodeResolution7.types b/tests/baselines/reference/nodeResolution7.types
index dfe118fd39510..fb31e87a0c79c 100644
--- a/tests/baselines/reference/nodeResolution7.types
+++ b/tests/baselines/reference/nodeResolution7.types
@@ -4,7 +4,7 @@ import y = require("a");
 
 === tests/cases/compiler/node_modules/a/index.d.ts ===
 declare module "a" {
->"a" : typeof "a"
+>"a" : typeof import("a")
 
     var x: number;
 >x : number
diff --git a/tests/baselines/reference/paramTagOnCallExpression.types b/tests/baselines/reference/paramTagOnCallExpression.types
index c5aa2c7c61130..2c525b61008c6 100644
--- a/tests/baselines/reference/paramTagOnCallExpression.types
+++ b/tests/baselines/reference/paramTagOnCallExpression.types
@@ -9,7 +9,7 @@ declare function factory(type: string): {};
 exports.inherits = factory('inherits')
 >exports.inherits = factory('inherits') : {}
 >exports.inherits : {}
->exports : typeof "tests/cases/conformance/jsdoc/a"
+>exports : typeof import("tests/cases/conformance/jsdoc/a")
 >inherits : {}
 >factory('inherits') : {}
 >factory : (type: string) => {}
diff --git a/tests/baselines/reference/parserExportAssignment6.types b/tests/baselines/reference/parserExportAssignment6.types
index 2a850e8a3ee07..b71064254785c 100644
--- a/tests/baselines/reference/parserExportAssignment6.types
+++ b/tests/baselines/reference/parserExportAssignment6.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment6.ts ===
 declare module "M" {
->"M" : typeof "M"
+>"M" : typeof import("M")
 
     export = A;
 >A : any
diff --git a/tests/baselines/reference/parserModuleDeclaration1.d.types b/tests/baselines/reference/parserModuleDeclaration1.d.types
index 0ccbe7ea89675..85c8e16f5559e 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.d.types
+++ b/tests/baselines/reference/parserModuleDeclaration1.d.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.d.ts ===
 module "Foo" {
->"Foo" : typeof "Foo"
+>"Foo" : typeof import("Foo")
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration1.types b/tests/baselines/reference/parserModuleDeclaration1.types
index f37435dacbd49..d64ef67326407 100644
--- a/tests/baselines/reference/parserModuleDeclaration1.types
+++ b/tests/baselines/reference/parserModuleDeclaration1.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration1.ts ===
 module "Foo" {
->"Foo" : typeof "Foo"
+>"Foo" : typeof import("Foo")
 }
diff --git a/tests/baselines/reference/parserModuleDeclaration2.types b/tests/baselines/reference/parserModuleDeclaration2.types
index 5794fdcca173b..839a7e5b23ad4 100644
--- a/tests/baselines/reference/parserModuleDeclaration2.types
+++ b/tests/baselines/reference/parserModuleDeclaration2.types
@@ -1,4 +1,4 @@
 === tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModuleDeclaration2.ts ===
 declare module "Foo" {
->"Foo" : typeof "Foo"
+>"Foo" : typeof import("Foo")
 }
diff --git a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
index 6eba8b6eb1cc1..acff252dad755 100644
--- a/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameAccessorDeclFile.types
@@ -239,7 +239,7 @@ class privateClassWithPrivateModuleGetAccessorTypes {
 }
 === tests/cases/compiler/privacyCannotNameAccessorDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
->"GlobalWidgets" : typeof "GlobalWidgets"
+>"GlobalWidgets" : typeof import("GlobalWidgets")
 
     export class Widget3 {
 >Widget3 : Widget3
diff --git a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
index 2ceffd034e16d..0263f5c82f375 100644
--- a/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
+++ b/tests/baselines/reference/privacyCannotNameVarTypeDeclFile.types
@@ -242,7 +242,7 @@ var privateVarWithPrivateModulePropertyTypes1 = exporter.createExportedWidget4()
 
 === tests/cases/compiler/privacyCannotNameVarTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
->"GlobalWidgets" : typeof "GlobalWidgets"
+>"GlobalWidgets" : typeof import("GlobalWidgets")
 
     export class Widget3 {
 >Widget3 : Widget3
diff --git a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
index c6ea5d358be94..7c9147180f3ea 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameParameterTypeDeclFile.types
@@ -434,7 +434,7 @@ function privateFunctionWithPrivateModuleParameterTypes1(param= exporter.createE
 }
 === tests/cases/compiler/privacyFunctionCannotNameParameterTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
->"GlobalWidgets" : typeof "GlobalWidgets"
+>"GlobalWidgets" : typeof import("GlobalWidgets")
 
     export class Widget3 {
 >Widget3 : Widget3
diff --git a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
index 863ca2e7c5105..a5de70a04e9c5 100644
--- a/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
+++ b/tests/baselines/reference/privacyFunctionCannotNameReturnTypeDeclFile.types
@@ -313,7 +313,7 @@ function privateFunctionWithPrivateModuleReturnTypes1() {
 
 === tests/cases/compiler/privacyFunctionReturnTypeDeclFile_GlobalWidgets.ts ===
 declare module "GlobalWidgets" {
->"GlobalWidgets" : typeof "GlobalWidgets"
+>"GlobalWidgets" : typeof import("GlobalWidgets")
 
     export class Widget3 {
 >Widget3 : Widget3
diff --git a/tests/baselines/reference/privacyGloImport.types b/tests/baselines/reference/privacyGloImport.types
index 263e36cbc0e76..c96cec357f428 100644
--- a/tests/baselines/reference/privacyGloImport.types
+++ b/tests/baselines/reference/privacyGloImport.types
@@ -230,7 +230,7 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
->"glo_M2_public" : typeof "glo_M2_public"
+>"glo_M2_public" : typeof import("glo_M2_public")
 
     export function f1();
 >f1 : () => any
@@ -248,7 +248,7 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
->"use_glo_M1_public" : typeof "use_glo_M1_public"
+>"use_glo_M1_public" : typeof import("use_glo_M1_public")
 
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
@@ -333,7 +333,7 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
->"anotherParseError" : typeof "anotherParseError"
+>"anotherParseError" : typeof import("anotherParseError")
 
     module m2 {
 >m2 : any
diff --git a/tests/baselines/reference/privacyGloImportParseErrors.types b/tests/baselines/reference/privacyGloImportParseErrors.types
index e6d615c355050..e1b5eecc2fe68 100644
--- a/tests/baselines/reference/privacyGloImportParseErrors.types
+++ b/tests/baselines/reference/privacyGloImportParseErrors.types
@@ -47,7 +47,7 @@ module m1 {
     }
 
     export declare module "m1_M3_public" {
->"m1_M3_public" : typeof "m1_M3_public"
+>"m1_M3_public" : typeof import("m1_M3_public")
 
         export function f1();
 >f1 : () => any
@@ -65,7 +65,7 @@ module m1 {
     }
 
     declare module "m1_M4_private" {
->"m1_M4_private" : typeof "m1_M4_private"
+>"m1_M4_private" : typeof import("m1_M4_private")
 
         export function f1();
 >f1 : () => any
@@ -343,7 +343,7 @@ module glo_M1_public {
 }
 
 declare module "glo_M2_public" {
->"glo_M2_public" : typeof "glo_M2_public"
+>"glo_M2_public" : typeof import("glo_M2_public")
 
     export function f1();
 >f1 : () => any
@@ -361,7 +361,7 @@ declare module "glo_M2_public" {
 }
 
 declare module "use_glo_M1_public" {
->"use_glo_M1_public" : typeof "use_glo_M1_public"
+>"use_glo_M1_public" : typeof import("use_glo_M1_public")
 
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
@@ -450,13 +450,13 @@ declare module "use_glo_M1_public" {
 }
 
 declare module "anotherParseError" {
->"anotherParseError" : typeof "anotherParseError"
+>"anotherParseError" : typeof import("anotherParseError")
 
     module m2 {
 >m2 : any
 
         declare module "abc" {
->"abc" : typeof "abc"
+>"abc" : typeof import("abc")
         }
     }
 
@@ -464,7 +464,7 @@ declare module "anotherParseError" {
 >m2 : any
 
         module "abc2" {
->"abc2" : typeof "abc2"
+>"abc2" : typeof import("abc2")
         }
     }
     module "abc3" {
diff --git a/tests/baselines/reference/privacyImportParseErrors.types b/tests/baselines/reference/privacyImportParseErrors.types
index ff9bf75f2b244..2f6c9e87dee2b 100644
--- a/tests/baselines/reference/privacyImportParseErrors.types
+++ b/tests/baselines/reference/privacyImportParseErrors.types
@@ -47,7 +47,7 @@ export module m1 {
     }
 
     export declare module "m1_M3_public" {
->"m1_M3_public" : typeof "m1_M3_public"
+>"m1_M3_public" : typeof import("m1_M3_public")
 
         export function f1();
 >f1 : () => any
@@ -65,7 +65,7 @@ export module m1 {
     }
 
     declare module "m1_M4_private" {
->"m1_M4_private" : typeof "m1_M4_private"
+>"m1_M4_private" : typeof import("m1_M4_private")
 
         export function f1();
 >f1 : () => any
@@ -368,7 +368,7 @@ module m2 {
     }
 
     export declare module "m2_M3_public" {
->"m2_M3_public" : typeof "m2_M3_public"
+>"m2_M3_public" : typeof import("m2_M3_public")
 
         export function f1();
 >f1 : () => any
@@ -386,7 +386,7 @@ module m2 {
     }
 
     declare module "m2_M4_private" {
->"m2_M4_private" : typeof "m2_M4_private"
+>"m2_M4_private" : typeof import("m2_M4_private")
 
         export function f1();
 >f1 : () => any
@@ -665,7 +665,7 @@ export module glo_M1_public {
 }
 
 export declare module "glo_M2_public" {
->"glo_M2_public" : typeof "glo_M2_public"
+>"glo_M2_public" : typeof import("glo_M2_public")
 
     export function f1();
 >f1 : () => any
@@ -705,7 +705,7 @@ export module glo_M3_private {
 }
 
 export declare module "glo_M4_private" {
->"glo_M4_private" : typeof "glo_M4_private"
+>"glo_M4_private" : typeof import("glo_M4_private")
 
     export function f1();
 >f1 : () => any
@@ -963,7 +963,7 @@ export import glo_im4_public = require("glo_M4_private");
 
 
 export declare module "use_glo_M1_public" {
->"use_glo_M1_public" : typeof "use_glo_M1_public"
+>"use_glo_M1_public" : typeof import("use_glo_M1_public")
 
     import use_glo_M1_public = glo_M1_public;
 >use_glo_M1_public : typeof use_glo_M1_public
@@ -1053,7 +1053,7 @@ export declare module "use_glo_M1_public" {
 
 
 declare module "use_glo_M3_private" {
->"use_glo_M3_private" : typeof "use_glo_M3_private"
+>"use_glo_M3_private" : typeof import("use_glo_M3_private")
 
     import use_glo_M3_private = glo_M3_private;
 >use_glo_M3_private : typeof use_glo_M3_private
@@ -1148,7 +1148,7 @@ declare module "anotherParseError" {
 >m2 : any
 
         declare module "abc" {
->"abc" : typeof "abc"
+>"abc" : typeof import("abc")
         }
     }
 
@@ -1156,11 +1156,11 @@ declare module "anotherParseError" {
 >m2 : any
 
         module "abc2" {
->"abc2" : typeof "abc2"
+>"abc2" : typeof import("abc2")
         }
     }
     module "abc3" {
->"abc3" : typeof "abc3"
+>"abc3" : typeof import("abc3")
     }
 }
 
@@ -1171,7 +1171,7 @@ declare export module "anotherParseError2" {
 >m2 : any
 
         declare module "abc" {
->"abc" : typeof "abc"
+>"abc" : typeof import("abc")
         }
     }
 
@@ -1179,11 +1179,11 @@ declare export module "anotherParseError2" {
 >m2 : any
 
         module "abc2" {
->"abc2" : typeof "abc2"
+>"abc2" : typeof import("abc2")
         }
     }
     module "abc3" {
->"abc3" : typeof "abc3"
+>"abc3" : typeof import("abc3")
     }
 }
 
diff --git a/tests/baselines/reference/reactNamespaceImportPresevation.types b/tests/baselines/reference/reactNamespaceImportPresevation.types
index 55c11d3e44a2b..a7596dd6d8227 100644
--- a/tests/baselines/reference/reactNamespaceImportPresevation.types
+++ b/tests/baselines/reference/reactNamespaceImportPresevation.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "my-React-Lib" {
->"my-React-Lib" : typeof "my-React-Lib"
+>"my-React-Lib" : typeof import("my-React-Lib")
 
     var a: any;
 >a : any
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
index 22566d71c0f75..c168a4f2878bf 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.types
@@ -12,7 +12,7 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts ===
 declare module "moduleC" {
->"moduleC" : typeof "moduleC"
+>"moduleC" : typeof import("moduleC")
 
     import self = require("moduleC");
 >self : any
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
index 9c7bb322c9303..48ed382d03577 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.types
@@ -12,7 +12,7 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts ===
 declare module "moduleC" {
->"moduleC" : typeof "moduleC"
+>"moduleC" : typeof import("moduleC")
 
     import self = require("moduleD");
 >self : any
@@ -21,7 +21,7 @@ declare module "moduleC" {
 >self : any
 }
 declare module "moduleD" {
->"moduleD" : typeof "moduleD"
+>"moduleD" : typeof import("moduleD")
 
     import self = require("moduleC");
 >self : any
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
index 81654cb4f7c52..758df16a80569 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.types
@@ -12,7 +12,7 @@ export var b: ClassB; // This should result in type ClassB
 
 === tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts ===
 declare module "moduleC" {
->"moduleC" : typeof "moduleC"
+>"moduleC" : typeof import("moduleC")
 
     import self = require("moduleD");
 >self : any
@@ -21,7 +21,7 @@ declare module "moduleC" {
 >self : any
 }
 declare module "moduleD" {
->"moduleD" : typeof "moduleD"
+>"moduleD" : typeof import("moduleD")
 
     import self = require("moduleE");
 >self : any
@@ -30,7 +30,7 @@ declare module "moduleD" {
 >self : any
 }
 declare module "moduleE" {
->"moduleE" : typeof "moduleE"
+>"moduleE" : typeof import("moduleE")
 
     import self = require("moduleC");
 >self : any
diff --git a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
index fd732fd26201b..1023cbf00ed44 100644
--- a/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
+++ b/tests/baselines/reference/resolveModuleNameWithSameLetDeclarationName2.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/resolveModuleNameWithSameLetDeclarationName2.ts ===
 declare module "punycode" {
->"punycode" : typeof "punycode"
+>"punycode" : typeof import("punycode")
 
     interface ucs2 {
 >ucs2 : ucs2
diff --git a/tests/baselines/reference/shebangBeforeReferences.types b/tests/baselines/reference/shebangBeforeReferences.types
index db04f7e6602ed..b8cc364cda535 100644
--- a/tests/baselines/reference/shebangBeforeReferences.types
+++ b/tests/baselines/reference/shebangBeforeReferences.types
@@ -17,7 +17,7 @@ use(x);
 
 === tests/cases/compiler/f.d.ts ===
 declare module "test" {
->"test" : typeof "test"
+>"test" : typeof import("test")
 
     let x: number;
 >x : number
diff --git a/tests/baselines/reference/spellingSuggestionModule.types b/tests/baselines/reference/spellingSuggestionModule.types
index 3e97894504e66..85f8b62fb6bd0 100644
--- a/tests/baselines/reference/spellingSuggestionModule.types
+++ b/tests/baselines/reference/spellingSuggestionModule.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/spellingSuggestionModule.ts ===
 declare module "foobar" { export const x: number; }
->"foobar" : typeof "foobar"
+>"foobar" : typeof import("foobar")
 >x : number
 
 foobar;
diff --git a/tests/baselines/reference/systemExportAssignment3.types b/tests/baselines/reference/systemExportAssignment3.types
index 7265f066c8d00..e550a7de47dc6 100644
--- a/tests/baselines/reference/systemExportAssignment3.types
+++ b/tests/baselines/reference/systemExportAssignment3.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/modules.d.ts ===
 declare module "a" {
->"a" : typeof "a"
+>"a" : typeof import("a")
 
     var a: number;
 >a : number
diff --git a/tests/baselines/reference/topLevelAmbientModule.types b/tests/baselines/reference/topLevelAmbientModule.types
index 7edf8d7b9878f..da7db2252d7d8 100644
--- a/tests/baselines/reference/topLevelAmbientModule.types
+++ b/tests/baselines/reference/topLevelAmbientModule.types
@@ -13,7 +13,7 @@ var z = foo.x + 10;
 
 === tests/cases/conformance/externalModules/foo_0.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
 	export var x: number;
 >x : number
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt b/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
index cb555b7a603ca..ef8d2164d42ff 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/externalModules/foo_2.ts(3,14): error TS2339: Property 'x' does not exist on type 'typeof "vs/foo_0"'.
+tests/cases/conformance/externalModules/foo_2.ts(3,14): error TS2339: Property 'x' does not exist on type 'typeof import("vs/foo_0")'.
 
 
 ==== tests/cases/conformance/externalModules/foo_2.ts (1 errors) ====
@@ -6,7 +6,7 @@ tests/cases/conformance/externalModules/foo_2.ts(3,14): error TS2339: Property '
     import foo = require("vs/foo_0");
     var z1 = foo.x + 10;   // Should error, as declaration should win
                  ~
-!!! error TS2339: Property 'x' does not exist on type 'typeof "vs/foo_0"'.
+!!! error TS2339: Property 'x' does not exist on type 'typeof import("vs/foo_0")'.
     var z2 = foo.y() + 10; // Should resolve
     
 ==== tests/cases/conformance/externalModules/vs/foo_0/index.ts (0 errors) ====
diff --git a/tests/baselines/reference/topLevelModuleDeclarationAndFile.types b/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
index a80254e7a6238..b1138fff39cab 100644
--- a/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
+++ b/tests/baselines/reference/topLevelModuleDeclarationAndFile.types
@@ -22,7 +22,7 @@ var z2 = foo.y() + 10; // Should resolve
 
 === tests/cases/conformance/externalModules/foo_1.ts ===
 declare module "vs/foo_0" {
->"vs/foo_0" : typeof "vs/foo_0"
+>"vs/foo_0" : typeof import("vs/foo_0")
 
 	export var y: () => number;
 >y : () => number
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.types b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
index 84cf51794f248..babbe8baef633 100644
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.types
+++ b/tests/baselines/reference/transformNestedGeneratorsWithTry.types
@@ -38,7 +38,7 @@ async function a(): Bluebird<void> {
 
 === tests/cases/compiler/bluebird.d.ts ===
 declare module "bluebird" {
->"bluebird" : typeof "bluebird"
+>"bluebird" : typeof import("bluebird")
 
     type Bluebird<T> = Promise<T>;
 >Bluebird : Promise<T>
diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types
index 03157790e7b34..e93252f20bc4a 100644
--- a/tests/baselines/reference/tsxElementResolution19.types
+++ b/tests/baselines/reference/tsxElementResolution19.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/jsx/react.d.ts ===
 declare module "react" {
->"react" : typeof "react"
+>"react" : typeof import("react")
 
 }
 
diff --git a/tests/baselines/reference/typeAliasExport.types b/tests/baselines/reference/typeAliasExport.types
index 5cbea867ad3be..906e1a0515d6d 100644
--- a/tests/baselines/reference/typeAliasExport.types
+++ b/tests/baselines/reference/typeAliasExport.types
@@ -1,6 +1,6 @@
 === tests/cases/compiler/typeAliasExport.ts ===
 declare module "a" {
->"a" : typeof "a"
+>"a" : typeof import("a")
 
   export default undefined
 >undefined : undefined
diff --git a/tests/baselines/reference/typeFromParamTagForFunction.types b/tests/baselines/reference/typeFromParamTagForFunction.types
index 98bd16824557a..ff2403653d3bd 100644
--- a/tests/baselines/reference/typeFromParamTagForFunction.types
+++ b/tests/baselines/reference/typeFromParamTagForFunction.types
@@ -11,7 +11,7 @@ declare var module: any, exports: any;
 exports.A = function () {
 >exports.A = function () {    this.x = 1;} : () => void
 >exports.A : () => void
->exports : typeof "tests/cases/conformance/salsa/a-ext"
+>exports : typeof import("tests/cases/conformance/salsa/a-ext")
 >A : () => void
 >function () {    this.x = 1;} : () => void
 
@@ -27,7 +27,7 @@ exports.A = function () {
 === tests/cases/conformance/salsa/a.js ===
 const { A } = require("./a-ext");
 >A : () => void
->require("./a-ext") : typeof "tests/cases/conformance/salsa/a-ext"
+>require("./a-ext") : typeof import("tests/cases/conformance/salsa/a-ext")
 >require : (id: string) => any
 >"./a-ext" : "./a-ext"
 
@@ -43,7 +43,7 @@ function a(p) { p.x; }
 exports.B = class {
 >exports.B = class {    constructor() {        this.x = 1;    }} : typeof (Anonymous class)
 >exports.B : typeof (Anonymous class)
->exports : typeof "tests/cases/conformance/salsa/b-ext"
+>exports : typeof import("tests/cases/conformance/salsa/b-ext")
 >B : typeof (Anonymous class)
 >class {    constructor() {        this.x = 1;    }} : typeof (Anonymous class)
 
@@ -60,7 +60,7 @@ exports.B = class {
 === tests/cases/conformance/salsa/b.js ===
 const { B } = require("./b-ext");
 >B : typeof (Anonymous class)
->require("./b-ext") : typeof "tests/cases/conformance/salsa/b-ext"
+>require("./b-ext") : typeof import("tests/cases/conformance/salsa/b-ext")
 >require : (id: string) => any
 >"./b-ext" : "./b-ext"
 
@@ -87,7 +87,7 @@ export function C() {
 === tests/cases/conformance/salsa/c.js ===
 const { C } = require("./c-ext");
 >C : () => void
->require("./c-ext") : typeof "tests/cases/conformance/salsa/c-ext"
+>require("./c-ext") : typeof import("tests/cases/conformance/salsa/c-ext")
 >require : (id: string) => any
 >"./c-ext" : "./c-ext"
 
@@ -116,7 +116,7 @@ export var D = function() {
 === tests/cases/conformance/salsa/d.js ===
 const { D } = require("./d-ext");
 >D : () => void
->require("./d-ext") : typeof "tests/cases/conformance/salsa/d-ext"
+>require("./d-ext") : typeof import("tests/cases/conformance/salsa/d-ext")
 >require : (id: string) => any
 >"./d-ext" : "./d-ext"
 
@@ -145,7 +145,7 @@ export class E {
 === tests/cases/conformance/salsa/e.js ===
 const { E } = require("./e-ext");
 >E : typeof E
->require("./e-ext") : typeof "tests/cases/conformance/salsa/e-ext"
+>require("./e-ext") : typeof import("tests/cases/conformance/salsa/e-ext")
 >require : (id: string) => any
 >"./e-ext" : "./e-ext"
 
diff --git a/tests/baselines/reference/typeReferenceDirectives12.types b/tests/baselines/reference/typeReferenceDirectives12.types
index 3503de37ad3b1..552f6f2dbf0cf 100644
--- a/tests/baselines/reference/typeReferenceDirectives12.types
+++ b/tests/baselines/reference/typeReferenceDirectives12.types
@@ -53,7 +53,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
->"./main" : typeof "/main"
+>"./main" : typeof import("/main")
 
     interface Cls {
 >Cls : Cls
diff --git a/tests/baselines/reference/typeReferenceDirectives9.types b/tests/baselines/reference/typeReferenceDirectives9.types
index 3503de37ad3b1..552f6f2dbf0cf 100644
--- a/tests/baselines/reference/typeReferenceDirectives9.types
+++ b/tests/baselines/reference/typeReferenceDirectives9.types
@@ -53,7 +53,7 @@ Cls.prototype.foo = function() { return undefined; }
 >undefined : undefined
 
 declare module "./main" {
->"./main" : typeof "/main"
+>"./main" : typeof import("/main")
 
     interface Cls {
 >Cls : Cls
diff --git a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
index 94411e4cfda68..d0ba83364fd5e 100644
--- a/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
+++ b/tests/baselines/reference/typeRootsFromMultipleNodeModulesDirectories.types
@@ -17,7 +17,7 @@ x + y + z;
 
 === /node_modules/@types/dopey/index.d.ts ===
 declare module "xyz" {
->"xyz" : typeof "xyz"
+>"xyz" : typeof import("xyz")
 
     export const x: number;
 >x : number
@@ -25,7 +25,7 @@ declare module "xyz" {
 
 === /foo/node_modules/@types/grumpy/index.d.ts ===
 declare module "pdq" {
->"pdq" : typeof "pdq"
+>"pdq" : typeof import("pdq")
 
     export const y: number; 
 >y : number
@@ -33,7 +33,7 @@ declare module "pdq" {
 
 === /foo/node_modules/@types/sneezy/index.d.ts ===
 declare module "abc" {
->"abc" : typeof "abc"
+>"abc" : typeof import("abc")
 
     export const z: number;
 >z : number
diff --git a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
index 9288256420df6..f1651eeec2a9e 100644
--- a/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
+++ b/tests/baselines/reference/typeRootsFromNodeModulesInParentDirectory.types
@@ -7,7 +7,7 @@ x;
 
 === /node_modules/@types/foo/index.d.ts ===
 declare module "xyz" {
->"xyz" : typeof "xyz"
+>"xyz" : typeof import("xyz")
 
     export const x: number;
 >x : number
diff --git a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
index 9046972c895c1..a3f8266dd8af3 100644
--- a/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofAmbientExternalModules.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"'.
+tests/cases/compiler/typeofAmbientExternalModules_2.ts(7,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
   Property 'C' is missing in type 'typeof D'.
-tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"'.
+tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
+  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
 
 
 ==== tests/cases/compiler/typeofAmbientExternalModules_2.ts (2 errors) ====
@@ -13,13 +13,13 @@ tests/cases/compiler/typeofAmbientExternalModules_2.ts(9,1): error TS2322: Type
     var y1: typeof ext = ext;
     y1 = exp;
     ~~
-!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"'.
+!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
 !!! error TS2322:   Property 'C' is missing in type 'typeof D'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
-!!! error TS2322: Type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof "tests/cases/compiler/typeofAmbientExternalModules_0"'.
+!!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")' is not assignable to type 'typeof D'.
+!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofAmbientExternalModules_0")'.
 ==== tests/cases/compiler/typeofAmbientExternalModules_0.ts (0 errors) ====
     export class C { foo: string; }
     
diff --git a/tests/baselines/reference/typeofExternalModules.errors.txt b/tests/baselines/reference/typeofExternalModules.errors.txt
index 0290a40c3263f..46b9d49d900b5 100644
--- a/tests/baselines/reference/typeofExternalModules.errors.txt
+++ b/tests/baselines/reference/typeofExternalModules.errors.txt
@@ -1,7 +1,7 @@
-tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof "tests/cases/compiler/typeofExternalModules_external"'.
+tests/cases/compiler/typeofExternalModules_core.ts(5,1): error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
   Property 'C' is missing in type 'typeof D'.
-tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typeof "tests/cases/compiler/typeofExternalModules_external"' is not assignable to type 'typeof D'.
-  Property 'prototype' is missing in type 'typeof "tests/cases/compiler/typeofExternalModules_external"'.
+tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
+  Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
 
 
 ==== tests/cases/compiler/typeofExternalModules_core.ts (2 errors) ====
@@ -11,13 +11,13 @@ tests/cases/compiler/typeofExternalModules_core.ts(7,1): error TS2322: Type 'typ
     var y1: typeof ext = ext;
     y1 = exp;
     ~~
-!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof "tests/cases/compiler/typeofExternalModules_external"'.
+!!! error TS2322: Type 'typeof D' is not assignable to type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
 !!! error TS2322:   Property 'C' is missing in type 'typeof D'.
     var y2: typeof exp = exp;
     y2 = ext;
     ~~
-!!! error TS2322: Type 'typeof "tests/cases/compiler/typeofExternalModules_external"' is not assignable to type 'typeof D'.
-!!! error TS2322:   Property 'prototype' is missing in type 'typeof "tests/cases/compiler/typeofExternalModules_external"'.
+!!! error TS2322: Type 'typeof import("tests/cases/compiler/typeofExternalModules_external")' is not assignable to type 'typeof D'.
+!!! error TS2322:   Property 'prototype' is missing in type 'typeof import("tests/cases/compiler/typeofExternalModules_external")'.
 ==== tests/cases/compiler/typeofExternalModules_external.ts (0 errors) ====
     export class C { }
     
diff --git a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
index 4af38220c078c..6f8a0e185954a 100644
--- a/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
+++ b/tests/baselines/reference/typesOnlyExternalModuleStillHasInstance.errors.txt
@@ -1,5 +1,5 @@
-tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeof "tests/cases/conformance/externalModules/foo_0"' is not assignable to type '{ M2: Object; }'.
-  Property 'M2' is missing in type 'typeof "tests/cases/conformance/externalModules/foo_0"'.
+tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
+  Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
 
 
 ==== tests/cases/conformance/externalModules/foo_1.ts (1 errors) ====
@@ -9,8 +9,8 @@ tests/cases/conformance/externalModules/foo_1.ts(5,5): error TS2322: Type 'typeo
     var x: typeof foo0 = {};
     var y: {M2: Object} = foo0;
         ~
-!!! error TS2322: Type 'typeof "tests/cases/conformance/externalModules/foo_0"' is not assignable to type '{ M2: Object; }'.
-!!! error TS2322:   Property 'M2' is missing in type 'typeof "tests/cases/conformance/externalModules/foo_0"'.
+!!! error TS2322: Type 'typeof import("tests/cases/conformance/externalModules/foo_0")' is not assignable to type '{ M2: Object; }'.
+!!! error TS2322:   Property 'M2' is missing in type 'typeof import("tests/cases/conformance/externalModules/foo_0")'.
     
 ==== tests/cases/conformance/externalModules/foo_0.ts (0 errors) ====
     export interface Person {
diff --git a/tests/baselines/reference/umd-augmentation-1.types b/tests/baselines/reference/umd-augmentation-1.types
index 0df11a2009a15..9909c549ecc44 100644
--- a/tests/baselines/reference/umd-augmentation-1.types
+++ b/tests/baselines/reference/umd-augmentation-1.types
@@ -47,7 +47,7 @@ var t = p.x;
 
 === tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof "tests/cases/conformance/externalModules/node_modules/math2d/index"
+>Math2d : typeof import("tests/cases/conformance/externalModules/node_modules/math2d/index")
 
 export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/umd-augmentation-2.types b/tests/baselines/reference/umd-augmentation-2.types
index 2effb43fb7693..d84c4d4a0207e 100644
--- a/tests/baselines/reference/umd-augmentation-2.types
+++ b/tests/baselines/reference/umd-augmentation-2.types
@@ -45,7 +45,7 @@ var t = p.x;
 
 === tests/cases/conformance/externalModules/node_modules/math2d/index.d.ts ===
 export as namespace Math2d;
->Math2d : typeof "tests/cases/conformance/externalModules/node_modules/math2d/index"
+>Math2d : typeof import("tests/cases/conformance/externalModules/node_modules/math2d/index")
 
 export interface Point {
 >Point : Point
diff --git a/tests/baselines/reference/umd-errors.types b/tests/baselines/reference/umd-errors.types
index 5464613dc1421..6aaddbc07d20e 100644
--- a/tests/baselines/reference/umd-errors.types
+++ b/tests/baselines/reference/umd-errors.types
@@ -6,7 +6,7 @@ export as namespace Foo;
 === tests/cases/conformance/externalModules/err2.d.ts ===
 // Illegal, can't be in external ambient module
 declare module "Foo" {
->"Foo" : typeof "Foo"
+>"Foo" : typeof import("Foo")
 
 	export as namespace Bar;
 >Bar : No type information available!
@@ -18,16 +18,16 @@ export var p;
 >p : any
 
 static export as namespace oo1;
->oo1 : typeof "tests/cases/conformance/externalModules/err3"
+>oo1 : typeof import("tests/cases/conformance/externalModules/err3")
 
 declare export as namespace oo2;
->oo2 : typeof "tests/cases/conformance/externalModules/err3"
+>oo2 : typeof import("tests/cases/conformance/externalModules/err3")
 
 public export as namespace oo3;
->oo3 : typeof "tests/cases/conformance/externalModules/err3"
+>oo3 : typeof import("tests/cases/conformance/externalModules/err3")
 
 const export as namespace oo4;
->oo4 : typeof "tests/cases/conformance/externalModules/err3"
+>oo4 : typeof import("tests/cases/conformance/externalModules/err3")
 
 === tests/cases/conformance/externalModules/err4.d.ts ===
 // Illegal, must be at top-level
diff --git a/tests/baselines/reference/umd1.types b/tests/baselines/reference/umd1.types
index b84aaf3ad7031..ca4a06270eb5d 100644
--- a/tests/baselines/reference/umd1.types
+++ b/tests/baselines/reference/umd1.types
@@ -30,5 +30,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof "tests/cases/conformance/externalModules/foo"
+>Foo : typeof import("tests/cases/conformance/externalModules/foo")
 
diff --git a/tests/baselines/reference/umd3.types b/tests/baselines/reference/umd3.types
index ef54806a174e9..96175ceaf3017 100644
--- a/tests/baselines/reference/umd3.types
+++ b/tests/baselines/reference/umd3.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof "tests/cases/conformance/externalModules/foo"
+>Foo : typeof import("tests/cases/conformance/externalModules/foo")
 
diff --git a/tests/baselines/reference/umd4.types b/tests/baselines/reference/umd4.types
index 3b6ebfa6ca78e..0005c0d83aa2a 100644
--- a/tests/baselines/reference/umd4.types
+++ b/tests/baselines/reference/umd4.types
@@ -32,5 +32,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof "tests/cases/conformance/externalModules/foo"
+>Foo : typeof import("tests/cases/conformance/externalModules/foo")
 
diff --git a/tests/baselines/reference/umd5.types b/tests/baselines/reference/umd5.types
index abd1c2b7d4767..ef790eba28809 100644
--- a/tests/baselines/reference/umd5.types
+++ b/tests/baselines/reference/umd5.types
@@ -37,5 +37,5 @@ export interface Thing { n: typeof x }
 >x : number
 
 export as namespace Foo;
->Foo : typeof "tests/cases/conformance/externalModules/foo"
+>Foo : typeof import("tests/cases/conformance/externalModules/foo")
 
diff --git a/tests/baselines/reference/umdGlobalConflict.types b/tests/baselines/reference/umdGlobalConflict.types
index 0bb26b47918bc..1d7cc259a3374 100644
--- a/tests/baselines/reference/umdGlobalConflict.types
+++ b/tests/baselines/reference/umdGlobalConflict.types
@@ -1,13 +1,13 @@
 === tests/cases/compiler/v1/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof "tests/cases/compiler/v1/index"
+>Alpha : typeof import("tests/cases/compiler/v1/index")
 
 export var x: string;
 >x : string
 
 === tests/cases/compiler/v2/index.d.ts ===
 export as namespace Alpha;
->Alpha : typeof "tests/cases/compiler/v2/index"
+>Alpha : typeof import("tests/cases/compiler/v2/index")
 
 export var y: number;
 >y : number
diff --git a/tests/baselines/reference/untypedModuleImport_allowJs.types b/tests/baselines/reference/untypedModuleImport_allowJs.types
index 2a854ce9d232f..91cd7614eee99 100644
--- a/tests/baselines/reference/untypedModuleImport_allowJs.types
+++ b/tests/baselines/reference/untypedModuleImport_allowJs.types
@@ -14,7 +14,7 @@ foo.bar();
 exports.default = { bar() { return 0; } }
 >exports.default = { bar() { return 0; } } : { [x: string]: any; bar(): number; }
 >exports.default : { [x: string]: any; bar(): number; }
->exports : typeof "/node_modules/foo/index"
+>exports : typeof import("/node_modules/foo/index")
 >default : { [x: string]: any; bar(): number; }
 >{ bar() { return 0; } } : { [x: string]: any; bar(): number; }
 >bar : () => number
diff --git a/tests/baselines/reference/untypedModuleImport_vsAmbient.types b/tests/baselines/reference/untypedModuleImport_vsAmbient.types
index f1991818ad194..ff0ee7fe2fff3 100644
--- a/tests/baselines/reference/untypedModuleImport_vsAmbient.types
+++ b/tests/baselines/reference/untypedModuleImport_vsAmbient.types
@@ -8,7 +8,7 @@ x;
 
 === /declarations.d.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export const x: number;
 >x : number
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation.types b/tests/baselines/reference/untypedModuleImport_withAugmentation.types
index 8bd23ca6aa5e9..665b955564a6e 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation.types
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation.types
@@ -1,6 +1,6 @@
 === /a.ts ===
 declare module "foo" {
->"foo" : typeof "foo"
+>"foo" : typeof import("foo")
 
     export const x: number;
 >x : number
diff --git a/tests/baselines/reference/untypedModuleImport_withAugmentation2.types b/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
index 89637715584d5..cbc00c5f12e08 100644
--- a/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
+++ b/tests/baselines/reference/untypedModuleImport_withAugmentation2.types
@@ -5,7 +5,7 @@ No type information for this code.=== /node_modules/augmenter/index.d.ts ===
 // This tests that augmenting an untyped module is forbidden even in an ambient context. Contrast with `moduleAugmentationInDependency.ts`.
 
 declare module "js" {
->"js" : typeof "js"
+>"js" : typeof import("js")
 
     export const j: number;
 >j : number
diff --git a/tests/baselines/reference/varRequireFromJavascript.types b/tests/baselines/reference/varRequireFromJavascript.types
index b17cc3f6f3b08..7eee4ec188a45 100644
--- a/tests/baselines/reference/varRequireFromJavascript.types
+++ b/tests/baselines/reference/varRequireFromJavascript.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/salsa/use.js ===
 var ex = require('./ex')
->ex : typeof "tests/cases/conformance/salsa/ex"
->require('./ex') : typeof "tests/cases/conformance/salsa/ex"
+>ex : typeof import("tests/cases/conformance/salsa/ex")
+>require('./ex') : typeof import("tests/cases/conformance/salsa/ex")
 >require : any
 >'./ex' : "./ex"
 
@@ -10,7 +10,7 @@ var crunch = new ex.Crunch(1);
 >crunch : Crunch
 >new ex.Crunch(1) : Crunch
 >ex.Crunch : typeof Crunch
->ex : typeof "tests/cases/conformance/salsa/ex"
+>ex : typeof import("tests/cases/conformance/salsa/ex")
 >Crunch : typeof Crunch
 >1 : 1
 
diff --git a/tests/baselines/reference/varRequireFromTypescript.types b/tests/baselines/reference/varRequireFromTypescript.types
index 78f0790239e78..496b691d0173f 100644
--- a/tests/baselines/reference/varRequireFromTypescript.types
+++ b/tests/baselines/reference/varRequireFromTypescript.types
@@ -1,7 +1,7 @@
 === tests/cases/conformance/salsa/use.js ===
 var ex = require('./ex')
->ex : typeof "tests/cases/conformance/salsa/ex"
->require('./ex') : typeof "tests/cases/conformance/salsa/ex"
+>ex : typeof import("tests/cases/conformance/salsa/ex")
+>require('./ex') : typeof import("tests/cases/conformance/salsa/ex")
 >require : any
 >'./ex' : "./ex"
 
@@ -10,7 +10,7 @@ var crunch = new ex.Crunch(1);
 >crunch : Crunch
 >new ex.Crunch(1) : Crunch
 >ex.Crunch : typeof Crunch
->ex : typeof "tests/cases/conformance/salsa/ex"
+>ex : typeof import("tests/cases/conformance/salsa/ex")
 >Crunch : typeof Crunch
 >1 : 1